拆零确认，规格型号等一些修改

src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java

@@ -132,22 +132,22 @@ public class IoCollectCodeBackupController extends BaseController {
             //如果是null 正常查询
             request.setSelectType(1);
         }
-        if (order.getCheckCodeStatus() != 1 && request.getSelectType() == 2){
+        if (order.getCheckCodeStatus() != 1 && request.getSelectType() == 2) {
             List<IoCollectOrderCheckCode> list = ioCollectOrderCheckCodeService.list(new LambdaQueryWrapper<IoCollectOrderCheckCode>().eq(IoCollectOrderCheckCode::getBillNo, request.getBillNo()));
-            if (list.size() > 0){
+            if (list.size() > 0) {
                 ioCollectOrderCheckCodeService.removeBatchByIds(list);
             }
             List<IoCollectCodeBackup> list1 = ioCollectCodeBackService.list(new LambdaQueryWrapper<IoCollectCodeBackup>().eq(IoCollectCodeBackup::getBillNo, request.getBillNo()));
             List<IoCollectCodeBackup> filteredList = list1.stream()
                     .filter(item -> item.getScanCodeCheckStatus() != null && item.getScanCodeCheckStatus() == 3)
                     .collect(Collectors.toList());
-            if (filteredList.size() > 0){
+            if (filteredList.size() > 0) {
                 ioCollectCodeBackService.removeBatchByIds(filteredList);
             }
             List<IoCollectCodeBackup> filteredList2 = list1.stream()
-                    .filter(item ->item.getScanCodeCheckStatus() != null && item.getScanCodeCheckStatus() == 1)
+                    .filter(item -> item.getScanCodeCheckStatus() != null && item.getScanCodeCheckStatus() == 1)
                     .collect(Collectors.toList());
-            if (filteredList2.size() > 0){
+            if (filteredList2.size() > 0) {
                 filteredList2.forEach(item -> item.setScanCodeCheckStatus(0));
                 // 调用服务层方法批量更新
                 ioCollectCodeBackService.updateBatchById(filteredList2);
@@ -156,7 +156,7 @@ public class IoCollectCodeBackupController extends BaseController {
             ioCollectOrderBackupService.updateByBillNo(order);
         }
         List<IoCollectCodeResponse> ioCollectCodeResponses = ioCollectCodeBackService.filterList(request);
-        for (IoCollectCodeResponse ioCollectCodeResponse : ioCollectCodeResponses){
+        for (IoCollectCodeResponse ioCollectCodeResponse : ioCollectCodeResponses) {
             UdiEntity udiEntity = FilterUdiUtils.getUdi(ioCollectCodeResponse.getCode());
             ioCollectCodeResponse.setSerialNo(udiEntity.getSerialNo());
             ioCollectCodeResponse.setProductDate(udiEntity.getProduceDate());
@@ -189,27 +189,24 @@ public class IoCollectCodeBackupController extends BaseController {
     }
 
     @PostMapping("/udiwms/basic/collect/IoCollectCodeBackup/scanCheckCode")
-    public BaseResponse scanCheckCode(@RequestBody IoCollectCodeRequest filterCodeRequest){
+    public BaseResponse scanCheckCode(@RequestBody IoCollectCodeRequest filterCodeRequest) {
         BaseResponse response = ioCollectCodeBackService.scanCheckCode(filterCodeRequest);
         return response;
     }
 
 
     @PostMapping("/udiwms/basic/collect/IoCollectCodeBackup/scanCheckCodeReplace")
-    public BaseResponse replaceScanCode(@RequestBody IoCollectCodeRequest filterCodeRequest){
+    public BaseResponse replaceScanCode(@RequestBody IoCollectCodeRequest filterCodeRequest) {
         BaseResponse response = ioCollectCodeBackService.replaceScanCode(filterCodeRequest);
         return response;
     }
 
 
-
     @PostMapping("/udiwms/basic/collect/IoCollectCodeBackup/commitCheckCodeOrder")
-    public BaseResponse commitCheckCodeOrder(@RequestBody IoCollectCodeRequest filterCodeRequest){
+    public BaseResponse commitCheckCodeOrder(@RequestBody IoCollectCodeRequest filterCodeRequest) {
         BaseResponse response = ioCollectCodeBackService.commitCheckCodeOrder(filterCodeRequest);
         return response;
     }
 
 
-
-
 }

src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java

@@ -96,7 +96,7 @@ public class IoCollectOrderBackupController extends BaseController {
             }
         }
 
-        List<CollectOrderBizResponse> collectOrderBizResponses1 = collectOrderBizResponses.stream().skip((collectOrderBizRequest.getPage()-1)*collectOrderBizRequest.getLimit()).limit(collectOrderBizRequest.getLimit()).
+        List<CollectOrderBizResponse> collectOrderBizResponses1 = collectOrderBizResponses.stream().skip((collectOrderBizRequest.getPage() - 1) * collectOrderBizRequest.getLimit()).limit(collectOrderBizRequest.getLimit()).
                 collect(Collectors.toList());
 
         PageInfo<CollectOrderBizResponse> pageInfo = new PageInfo<>(collectOrderBizResponses);

src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java

@@ -116,7 +116,7 @@ public class IoCollectOrderCodeManController extends BaseController {
                         collectOrder = collectOrderCodeManService.prescribeTagCode(addTagCodeReqeust);
                     }
                     IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
-                    collectOrderBiz.setId(collectOrder.getId());
+                    collectOrderBiz.setId(Long.parseLong(data[0]));
                     collectOrderBiz.setSplitUnCheck(true);
                     collectOrderBizService.updateById(collectOrderBiz);
                     return ResultVOUtils.success(collectOrder);
@@ -225,6 +225,7 @@ public class IoCollectOrderCodeManController extends BaseController {
         } else collectOrderCodeMEN = addTagCodeReqeust.getCollectOrderCodeManList();
         if (CollUtil.isNotEmpty(collectOrderCodeMEN)) {
             for (IoCollectOrderCodeMan collectOrderCodeMan : collectOrderCodeMEN) {
+                collectOrderCodeMan.setIsSplitCode(true);
                 collectOrderCodeManService.updateById(collectOrderCodeMan);
                 IoCollectOrderBiz collectiveOrderBiz = new IoCollectOrderBiz();
                 collectiveOrderBiz.setId(collectOrderCodeMan.getBizIdFk());

src/main/java/com/glxp/api/entity/collect/IoCollectCodeBackup.java

@@ -111,7 +111,7 @@ public class IoCollectCodeBackup implements Serializable {
 
 
     /**
-     * 赋码方式 1:自动拆零赋码；2:自动整取赋码;3.手动赋码
+     * 赋码方式 1:自动拆零赋码；2:自动整取赋码;3.手动整取赋码，4.手动拆零赋码
      */
     @TableField(value = "fifoSplit")
     @ApiModelProperty(value = "")
@@ -168,5 +168,10 @@ public class IoCollectCodeBackup implements Serializable {
     private Long inBatchNo;
 
 
+    @TableField(value = "isSplitCode")
+    @ApiModelProperty(value = "是否拆零码")
+    private Boolean isSplitCode;
+
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -113,7 +113,8 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
         for (IoCollectOrderCodeMan ioCollectOrderCodeMan : manList) {
             //查询采购类型
             UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(ioCollectOrderCodeMan.getRelId() + "");
-            ioCollectCodes.add(IoCollectCodeBackup.builder().code(ioCollectOrderCodeMan.getUdiCode())
+
+            IoCollectCodeBackup collectCodeBackup = IoCollectCodeBackup.builder().code(ioCollectOrderCodeMan.getUdiCode())
                     .fromType(collectOrder.getFromType())
                     .busType(collectOrder.getBusType())
                     .billNo(collectOrder.getBillNo())
@@ -125,7 +126,12 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
                     .relId(ioCollectOrderCodeMan.getRelId())
                     .remark(collectOrder.getRemark())
                     .purType(udiRelevanceResponse.getPurType())
-                    .inBatchNo(System.currentTimeMillis()).build());
+                    .inBatchNo(System.currentTimeMillis()).build();
+
+            if (IntUtil.value(ioCollectOrderCodeMan.getIsSplitCode())) {
+                collectCodeBackup.setFifoSplit(4);
+            }
+            ioCollectCodes.add(collectCodeBackup);
         }
         collectCodeBackService.saveBatch(ioCollectCodes);
     }
@@ -176,11 +182,11 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
         collectCodeBackService.saveBatch(ioCollectCodes);
     }
 
-    public void depleteScanCode(String billNo){
+    public void depleteScanCode(String billNo) {
         List<IoCollectCodeBackup> ioCollectCodeBackups = collectCodeBackService.listByBillNo(billNo);
         ArrayList<IoCollectCodeBackup> ioCollectCodeBackups1 = new ArrayList<>();
         for (IoCollectCodeBackup collectCodeBackup : ioCollectCodeBackups) {
-            if (collectCodeBackup.getBusType().equals("QXCF001") && collectCodeBackup.getPurType() != 1){
+            if (collectCodeBackup.getBusType().equals("QXCF001") && collectCodeBackup.getPurType() != 1) {
                 collectCodeBackup.setIsUsed(true);
                 ioCollectCodeBackups1.add(collectCodeBackup);
             }

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -689,7 +689,8 @@
             <if test="filterType != null and filterType == 2 and productsType == 2">
                 AND ((thirdId = '' or thirdId is null) or (thirdId1 = '' or thirdId1 is null)
                     or (thirdId2 = '' or thirdId2 is null) or (thirdId3 = '' or thirdId3 is null)
-                or  (thirdId4 = '' or thirdId4 is null)) AND (mainId = '' or mainId is null)
+                    or (thirdId4 = '' or thirdId4 is null))
+                AND (mainId = '' or mainId is null)
             </if>
             <if test="filterType != null and filterType == 3">
                 AND (mainId is NULL or mainId = '')
@@ -1345,7 +1346,7 @@
          groupBuy, needCert, isStack,
          distributeLevelCount, useLevel,
          distributeLevel,
-                 splitEnable, autoCode, distributeMaxLevel, useMaxLevel, unpackUseTime,detailSort)
+         splitEnable, autoCode, distributeMaxLevel, useMaxLevel, unpackUseTime, detailSort)
         values (#{id},
                 #{uuid},
                 #{mainId},
@@ -1706,7 +1707,10 @@
                basic_products.sfwwjbz,
                basic_products.syqsfxyjxmj,
                basic_products.mjfs,
-        basic_products.categoryName, basic_products.bhltcjsl, basic_products.bhsycjsl,basic_products.xjdw
+               basic_products.categoryName,
+               basic_products.bhltcjsl,
+               basic_products.bhsycjsl,
+               basic_products.xjdw
         FROM basic_udirel
                  INNER JOIN basic_products
                             on basic_udirel.uuid = basic_products.uuid
@@ -1778,6 +1782,8 @@
                basic_products.bhxjcpbm,
                basic_products.bzcj,
                basic_products.cpmctymc,
+               basic_products.bzgg,
+               basic_products.ggxh,
                basic_products.cplb,
                basic_products.flbm,
                basic_products.ggxh,
@@ -1971,8 +1977,11 @@
                basic_products.zdcfsycs,
                basic_products.sfwwjbz,
                basic_products.syqsfxyjxmj,
-        basic_products.mjfs, basic_products.bhltcjsl, basic_products.bhsycjsl,
+               basic_products.mjfs,
-        basic_products.xjdw, basic_products.levelUnit,
+               basic_products.bhltcjsl,
+               basic_products.bhsycjsl,
+               basic_products.xjdw,
+               basic_products.levelUnit,
                basic_products.categoryName
         FROM basic_udirel
                  inner JOIN basic_products

src/main/resources/schemas/schema_v2.4.sql

@@ -5118,3 +5118,11 @@ CALL Pro_Temp_ColumnWork('io_collect_set', 'getSplitConfirm',
 CALL Pro_Temp_ColumnWork('sys_workplace_freight', 'isSingQueue',
                          ' tinyint NULL DEFAULT b''1''COMMENT ''是否启用单品种槽位 0:关闭 1:开启''',
                          1);
+
+
+
+CALL Pro_Temp_ColumnWork('io_collect_code_backup', 'isSplitCode',
+                         ' tinyint NULL DEFAULT b''1''COMMENT ''是否拆零码''',
+                         1);
+
+