pcn

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxProduceSnExtService.java

@@ -93,7 +93,7 @@ public class JxProduceSnExtService implements IJxProduceSnExtService {
 
         produceSnList = produceSnList.stream().filter(o -> null != o).sorted(Comparator.comparing(MesProduceSn::getModifyDatetime).reversed()).collect(Collectors.toList());
 
-        if (!CollectionUtils.isEmpty(produceSnList) && produceSnList.size() > 50) produceSnList = produceSnList.subList(0, 50);
+        if (!CollectionUtils.isEmpty(produceSnList) && produceSnList.size() > 20) produceSnList = produceSnList.subList(0, 20);
 
         List<JxSnWorkCellScanModel> resultList = null;
 
@@ -108,7 +108,7 @@ public class JxProduceSnExtService implements IJxProduceSnExtService {
             else if (MesPcnExtEnumUtil.SN_OPERATE_TYPE.REPAIR.getValue() == produceSnExt.getOperateType()) result.statusName("返修中").color(MesPcnExtConstWords.YELLOW);
             else result.statusName("未完成");
 
-            resultList.add(result.manageCode(produceSnExt.getTrayNo()).index(index));
+            resultList.add(result.qcStatusName(MesPcnExtEnumUtil.PRODUCE_SN_QC_STATUS.valueOfDescription(produceSnExt.getQcStatus())).manageCode(produceSnExt.getTrayNo()).index(index));
             index ++;
         }
 

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/jx/JxSnWorkCellScanModel.java

@@ -38,6 +38,9 @@ public class JxSnWorkCellScanModel implements Serializable {
     @ApiParam("状态")
     private String statusName;
 
+    @ApiParam("质量状态")
+    private String qcStatusName;
+
     @ApiParam("颜色")
     private String color;
 
@@ -56,6 +59,11 @@ public class JxSnWorkCellScanModel implements Serializable {
         return this;
     }
 
+    public JxSnWorkCellScanModel qcStatusName(String qcStatusName) {
+        this.qcStatusName = qcStatusName;
+        return this;
+    }
+
     public JxSnWorkCellScanModel color(String color) {
         this.color = color;
         return this;