1.API010失败后状态还是wait

  2.return页面的数据点了数量后没有数据

src/main/java/com/neotel/smfcore/core/inList/service/po/InListItem.java

@@ -108,7 +108,7 @@ public class InListItem extends BasePo implements Serializable {
     }
 
     public boolean isXray() {
-        return state == INITEM_STATUS.XRay || state == INITEM_STATUS.XRayFail;
+        return state == INITEM_STATUS.XRay || state == INITEM_STATUS.XRayFail||state==INITEM_STATUS.XRayEnd;
 
     }
     public boolean isFailure() {

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

@@ -843,8 +843,17 @@ public class LiteOrderCache {
             }).collect(Collectors.toList());
         }
         //mes提前扣除，扣除成功的直接出库，失败的标记状态
-        List<TrackStatus> trackStatusList = MicronApi.Api010(operationId, materialList);
-        if (trackStatusList != null && !trackStatusList.isEmpty()) {
+
+        List<TrackStatus> trackStatusList = new ArrayList<>();
+
+        try {
+            MicronApi.Api010(operationId, materialList);
+        } catch (Exception exception) {
+            log.error("Api010 出错： " + exception.toString());
+        }
+        if (trackStatusList == null) {
+            trackStatusList = new ArrayList<>();
+        }
         for (LiteOrderItem orderItem : order.getOrderItems()) {
             String ri = orderItem.getRi();
 
@@ -882,7 +891,7 @@ public class LiteOrderCache {
             }
             liteOrderItemManager.save(orderItem);
         }
-        }
+
         log.info("preTaskCheckOut 出库单[" + order.getOrderNo() + "] operatetionId [" + order.getOperationId() + "] 出库完成，累计任务数=" + taskReelCount);
         order.setTaskReelCount(taskReelCount);
         order.setTotalTaskReelCount(order.getTotalTaskReelCount() + taskReelCount);

src/main/java/com/neotel/smfcore/custom/micron1053/loading/LoadingController.java

@@ -83,8 +83,7 @@ public class LoadingController {
                 dto.setSuccessQty(dto.getSuccessQty() + 1);
             } else if(item.getState()==INITEM_STATUS.API001NG) {
                 dto.setNg(dto.getNg() + 1);
-            }else
-              if (item.isFailure()) {
+            }else  if (item.isFailure()) {
                 dto.setFailure(dto.getFailure() + 1);
             } else if (item.isXray()) {
                 dto.setXRay(dto.getXRay() + 1);
@@ -113,44 +112,46 @@ public class LoadingController {
 
         //参数：mType 物料类型：pcb/shoebox/pizzaBox/reel/tray
         //参数：state 状态： success/xray/failure
-        String mType=params.get("mType").toString();
-        String state=params.get("state").toString();
+        String mType = params.get("mType").toString();
+        String state = params.get("state").toString();
 
-        List<MaterialDtialDto> dtos=new ArrayList<>();
-        if(MicronApi.Debug){
+        List<MaterialDtialDto> dtos = new ArrayList<>();
+        if (MicronApi.Debug) {
             for (int i = 1; i <= 5; i++
-            ){
-                MaterialDtialDto dto=new MaterialDtialDto("barcode"+i,"pn"+i,new Date(),"proN"+i,
-                        233,7,8,"provider"+i,"batch"+i,"msl"+i,"posName"+i,"");
+            ) {
+                MaterialDtialDto dto = new MaterialDtialDto("barcode" + i, "pn" + i, new Date(), "proN" + i,
+                        233, 7, 8, "provider" + i, "batch" + i, "msl" + i, "posName" + i, "");
 
                 dtos.add(dto);
             }
         }
 
-        InList inList=loadingUtil.getInlist();
-        if(inList==null) {
+        InList inList = loadingUtil.getInlist();
+        if (inList == null) {
             return ResultBean.newErrorResult(-1, "smfcore.micron.nodata", "未找到信息");
         }
         for (InListItem item :
                 inList.getInListItems()) {
-            if(item.getMType().equals(mType)) {
-                boolean is=false;
-                if (item.isSuccess() && state.equals("success")) {
-                    is=true;
-                } else if (item.isFailure()&& state.equals("xray")) {
-                    is=true;
-                } else if (item.isXray()&& state.equals("failure")) {
-                    is=true;
-                }
-                if(is){
-                    Barcode code=barcodeManager.findByBarcode(item.getRi());
-                    MaterialDtialDto dto=new MaterialDtialDto(code.getBarcode(),code.getPartNumber(),code.getExpireDate(),code.getProviderNumber(),
-                            code.getAmount(),code.getPlateSize(),code.getHeight(),code.getProvider(),code.getBatch(),code.getMsl(),code.getPosName(),"" );
+            if (item.getMType().equalsIgnoreCase(mType)) {
+                boolean is = false;
+                if (item.isSuccess() && state.equalsIgnoreCase("success")) {
+                    is = true;
+                } else if (item.getState() == INITEM_STATUS.API001NG && state.equalsIgnoreCase("ng")) {
+                    is = true;
+                } else if (item.isFailure() && state.equalsIgnoreCase("failure")) {
+                    is = true;
+                } else if (item.isXray() && state.equalsIgnoreCase("xray")) {
+                    is = true;
+                }
+
+                if (is) {
+                    Barcode code = barcodeManager.findByBarcode(item.getRi());
+                    MaterialDtialDto dto = new MaterialDtialDto(code.getBarcode(), code.getPartNumber(), code.getExpireDate(), code.getProviderNumber(),
+                            code.getAmount(), code.getPlateSize(), code.getHeight(), code.getProvider(), code.getBatch(), code.getMsl(), code.getPosName(), "");
 
                     dtos.add(dto);
                 }
             }
-
         }
 
         return ResultBean.newOkResult(dtos);

src/main/java/com/neotel/smfcore/custom/micron1053/task/MicronPreTaskController.java

@@ -8,6 +8,8 @@ import com.neotel.smfcore.common.utils.Constants;
 import com.neotel.smfcore.common.utils.JsonUtil;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
+import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
+import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.device.enums.OP;
 import com.neotel.smfcore.core.device.enums.OP_STATUS;
 import com.neotel.smfcore.core.device.util.DataCache;
@@ -75,6 +77,8 @@ public class MicronPreTaskController {
 
     @Autowired
     private IDataLogManager dataLogManager;
+    @Autowired
+    private IBarcodeManager barcodeManager;
 
 //    @Autowired
 //    private MicronConfig micronConfig;
@@ -195,15 +199,15 @@ public class MicronPreTaskController {
                     item.setRi(material.getSerialNum());
                     item.setNeedReelCount(1);
                     item.setMode(mode);
-
-        //                //验证是否有料，无料直接显示缺料
-        //                StoragePos pos = storagePosManager.getByBarcode(item.getRi());
-        //                if (pos == null) {
-        //                    item.setStatus(OrderItemStatus.shortage);
-        //                } else {
-
                     item.setStatus(OrderItemStatus.wait);
-        //                }
+
+                    Barcode barcode= barcodeManager.findByBarcode(material.getSerialNum());
+                    if(barcode!=null){
+                        item.setNeedNum(barcode.getAmount());
+                    }else{
+                        item.setNeedNum(0);
+                        log.info("未找到 serialNum="+material.getSerialNum()+",设置amount=0");
+                    }
                     itemList.add(item);
                 }
                 LiteOrder liteOrder = new LiteOrder();