2/21 界面优化1.3

src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java

@@ -128,6 +128,8 @@ public class CollectOrderBizResponse {
     private String unSplitUdiCode;
     private String finishUdiCode;
     private String bzgg;
+    private String prepnSpec;
+
 
 
     private Integer autoResCount;
@@ -184,7 +186,6 @@ public class CollectOrderBizResponse {
     private String checkCode;
 
     private String queueCode;
-    private String prepnSpec;
     private Integer ledNum;
 
     /**

src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java

@@ -506,14 +506,14 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
 
             UdiRelevanceResponse udiRelevanceResponse = udiRelevanceMap.get(collectOrderBizResponse.getNameCode());
             if (udiRelevanceResponse != null) {
-                for (IoCollectCodeBackup ioCollectCodeBackup : ioCollectCodeBackups) {
-                    if (ioCollectCodeBackup.getRelId().equals(udiRelevanceResponse.getId())) {
-                        collectOrderBizResponse.setScanUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getScanUdiCode()) + "," + ioCollectCodeBackup.getCode());
-                    }
-                }
-                if (StrUtil.isNotEmpty(collectOrderBizResponse.getScanUdiCode())) {
-                    collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getScanUdiCode() == null ? "" : collectOrderBizResponse.getScanUdiCode().substring(1));
-                }
+//                for (IoCollectCodeBackup ioCollectCodeBackup : ioCollectCodeBackups) {
+//                    if (ioCollectCodeBackup.getRelId().equals(udiRelevanceResponse.getId())) {
+//                        collectOrderBizResponse.setScanUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getScanUdiCode()) + "," + ioCollectCodeBackup.getCode());
+//                    }
+//                }
+//                if (StrUtil.isNotEmpty(collectOrderBizResponse.getScanUdiCode())) {
+//                    collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getScanUdiCode() == null ? "" : collectOrderBizResponse.getScanUdiCode().substring(1));
+//                }
             }
             collectOrderBizResponses.add(collectOrderBizResponse);
         }

src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml

@@ -7,6 +7,7 @@
         bp.nameCode                   diCode,
         bp.zczbhhzbapzbh,
         bp.packUnit,
+        bp.prepnSpec,
         bp.manufactory,
         COALESCE(bp.bzgg,bp.ggxh) AS spec
         FROM io_collect_order_biz_backup icobb