工单出库BUG修改。

src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java

@@ -661,9 +661,9 @@ public class BaseDeviceHandler implements IDeviceHandler {
 
 
         //判断是否是工单出库
-        if(ObjectUtil.isNotEmpty( task.getSourceId())&&task.getOutType()==10){
+        if(ObjectUtil.isNotEmpty( task.getSourceId())&&ObjectUtil.isNotEmpty(task.getSourceName())&&task.getOutType()==10){
 
-            LiteOrder liteOrder=liteOrderCache.findOrderByNo(task.getSourceId());
+            LiteOrder liteOrder=liteOrderCache.findOrderByNo(task.getSourceName());
             LiteOrderItem item=liteOrder.getItemByPn(task.getPartNumber());
             int interceptFlag=task.isNeedSplitting()?1:0;
             int interceptQty=task.getNeedQty();

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -550,6 +550,20 @@ public class LiteOrderCache implements ITaskListener {
                 }
             }
 
+            if(targetNum>0&&isGuizhong || needJieliao) {
+                if (tempPos != null) {
+                    if (!itemPosNameList.contains(tempPos.getPosName())) {
+                        itemPosList.add(tempPos);
+                        itemPosNameList.add(tempPos.getPosName());
+                        targetNum -= tempPos.getBarcode().getAmount();
+                        //截料的数量
+                        if (targetNum < 0) {
+                            jieliaoPosMap.put(tempPos.getPosName(), targetNum);
+                        }
+                    }
+                }
+            }
+
             //第一轮循环完，判断是否需要再次循环
             if (targetNum > 0 && wholeReelCount > 0) {
 
@@ -609,6 +623,7 @@ public class LiteOrderCache implements ITaskListener {
                 task.setType(OP.CHECKOUT);
                 task.setLightColor(nextColor.getRgb());
                 task.setStatus(OP_STATUS.WAIT.name());
+                task.setOperator(userName);
 
                 task.setOutType(10);//工单出库类型为10
                 if(itemReelCount==0){

src/main/java/com/neotel/smfcore/core/system/service/po/DataLog.java

@@ -230,7 +230,7 @@ public class DataLog extends BasePo implements Serializable {
     /**
      * 截料的物料此次出库需要的数量
      */
-    private Integer needQty;
+    private int needQty=0;
 
     /**
      * 是否是首盘料