ReturnMaterial点击数量显示对应状态的物料信息

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

@@ -104,15 +104,19 @@ public class InListItem extends BasePo implements Serializable {
         }
 
     public boolean isSuccess(){
-        return state==INITEM_STATUS.Success||state==INITEM_STATUS.PutIn||state==INITEM_STATUS.PutEnd;
+        return state==INITEM_STATUS.Success||state==INITEM_STATUS.PutIn||state==INITEM_STATUS.PutEnd||state==INITEM_STATUS.Wait||state==INITEM_STATUS.Cancel;
     }
 
     public boolean isXray() {
-        return state == INITEM_STATUS.XRay || state == INITEM_STATUS.XRayFail||state==INITEM_STATUS.XRayEnd;
+        return state == INITEM_STATUS.XRay ||  state==INITEM_STATUS.XRayEnd;
 
     }
+    public boolean isNg() {
+        return state == INITEM_STATUS.API001NG;
+    }
+
     public boolean isFailure() {
-        return state == INITEM_STATUS.Fail;
+        return state == INITEM_STATUS.Fail||  state==INITEM_STATUS.XRayFail;
     }
     /**
      * 入库详情

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

@@ -81,15 +81,17 @@ public class LoadingController {
         for (InListItem item :
                 inList.getInListItems()) {
             String mtype = item.getMType();
-            MaterialLoadingDto dto = dtoMap.getOrDefault(mtype, new MaterialLoadingDto(mtype, 0,0, 0, 0));
-            if (item.isSuccess()) {
-                dto.setSuccessQty(dto.getSuccessQty() + 1);
-            } else if(item.getState()==INITEM_STATUS.API001NG) {
+            MaterialLoadingDto dto = dtoMap.getOrDefault(mtype, new MaterialLoadingDto(mtype, 0, 0, 0, 0));
+//            if (item.isSuccess()) {
+//            } else
+            if (item.isNg()) {
                 dto.setNg(dto.getNg() + 1);
-            }else  if (item.isFailure()) {
+            } else if (item.isFailure()) {
                 dto.setFailure(dto.getFailure() + 1);
-            } else if (item.getToXray() != null && !item.getToXray()) {
+            } else if (item.isXray()) {
                 dto.setXRay(dto.getXRay() + 1);
+            } else {
+                dto.setSuccessQty(dto.getSuccessQty() + 1);
             }
             dtoMap.put(dto.getMaterialType(), dto);
         }
@@ -114,7 +116,7 @@ public class LoadingController {
     public ResultBean detial(@RequestParam Map<String,Object> params ) {
 
         //参数：mType 物料类型：pcb/shoebox/pizzaBox/reel/tray
-        //参数：state 状态： success/xray/failure
+        //参数：state 状态： success/xray/failure/ng
         String mType = params.get("mType").toString();
         String state = params.get("state").toString();
 
@@ -123,7 +125,7 @@ public class LoadingController {
             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, "");
+                        233, 7, 8, "provider" + i, "batch" + i, "msl" + i, "posName" + i, "",state);
 
                 dtos.add(dto);
             }
@@ -139,24 +141,21 @@ public class LoadingController {
                 boolean is = false;
                 if (item.isSuccess() && state.equalsIgnoreCase("success")) {
                     is = true;
-                } else if (item.getState() == INITEM_STATUS.API001NG && state.equalsIgnoreCase("ng")) {
+                } else if (item.isNg() && state.equalsIgnoreCase("ng")) {
                     is = true;
                 } else if (item.isFailure() && state.equalsIgnoreCase("failure")) {
                     is = true;
-                }  else if (item.getToXray() != null && !item.getToXray()) {
+                }  else if (item.isXray() && state.equalsIgnoreCase("xray")) {
                     is = true;
                 }
-                /*else if (item.isXray() && state.equalsIgnoreCase("xray")) {
-                    is = true;
-                }*/
                 try{
                     if (is) {
                         MaterialDtialDto dto= new MaterialDtialDto(item.getRi(), item.getPN(), new Date(), "",
-                                0, 0, 0, "", "", "", item.getPosName(), item.getNgMsg());
+                                0, 0, 0, "", "", "", item.getPosName(), item.getNgMsg(),item.getState());
                         Barcode code = barcodeManager.findByBarcode(item.getRi());
                         if (code != null) {
                             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(), item.getNgMsg());
+                                    code.getAmount(), code.getPlateSize(), code.getHeight(), code.getProvider(), code.getBatch(), code.getMsl(), code.getPosName(), item.getNgMsg(),item.getState());
 
                         } else {
                             try{
@@ -164,7 +163,7 @@ public class LoadingController {
                                 code = codeResolve.resolveOneValideBarcode(item.getRi());
                                 if(code!=null){
                                     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(), item.getNgMsg());
+                                            code.getAmount(), code.getPlateSize(), code.getHeight(), code.getProvider(), code.getBatch(), code.getMsl(), code.getPosName(), item.getNgMsg(),item.getState());
 
                                 }
                             }catch (Exception ex){