代码备份

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

@@ -399,14 +399,7 @@ public class IoCollectOrderController extends BaseController {
             boolean isAllTag = collectOrderBizResponses.stream()
                     .allMatch(obj -> StrUtil.isNotEmpty(obj.getFinishUdiCode()) || obj.getAutoTagStatus() == 2);
             if (!isAllTag) {
-//                SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByBusType(collectOrderRequest.getBusType());
-//                if (IntUtil.value(sysWorkplaceDocumentEntity.getOrderFinishVerify()) == 1) {
-//
-//                } else {
-//                    return ResultVOUtils.error(503, "该业务单据未全部赋码，无法完成单据？");
-//                }
                 return ResultVOUtils.error(502, "该业务单据未全部赋码，是否强制完成单据？");
-
             }
         }
         collectOrderRequest.setUpdateUser(getUserId());
@@ -415,6 +408,31 @@ public class IoCollectOrderController extends BaseController {
     }
 
 
+    /**
+     * 完成单据
+     *
+     * @return
+     */
+    @PostMapping("/udiwms/basic/collect/order/bizConfirm")
+    @Transactional(rollbackFor = Exception.class)
+    public BaseResponse bizConfirmOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
+
+
+        /**
+         * 扫码确认
+         */
+
+
+        return ResultVOUtils.success();
+    }
+
+
+    /**
+     * 确认取药
+     *
+     * @param collectOrderRequest
+     * @return
+     */
     @PostMapping("/udiwms/basic/collect/order/vailFinish")
     public BaseResponse vailOrderFinish(@RequestBody CollectOrderRequest collectOrderRequest) {
         if (StrUtil.isEmpty(collectOrderRequest.getBillNo()))

src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java

@@ -149,5 +149,10 @@ public class CollectOrderRequest extends ListPageRequest {
     //发货方
     private String shipperName;
 
+    /**
+     * 业务单号ID
+     */
+    private Long bizId;
+
 
 }

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

@@ -821,6 +821,9 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
         });
     }
 
+
+
+
     private void removeOrderByBillNo(IoCollectOrder collectOrder) {
         String billNo = collectOrder.getBillNo();
         this.remove(new LambdaUpdateWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, billNo));

src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java

@@ -17,6 +17,7 @@ import com.glxp.api.entity.inout.IoSplitFifoInv;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.req.collect.AddInvDesDetaiRequest;
+import com.glxp.api.req.collect.CollectOrderRequest;
 import com.glxp.api.req.inout.IoSplitCodeRequest;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
 import com.glxp.api.service.basic.UdiRelevanceService;
@@ -147,29 +148,34 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                 //再次执行赋码
                 ioSplitCodeEntities = findSplitCodes(collectOrderBiz.getRelId(), collectOrderBiz.getBatchNo(), putWorkPlaceCode);
                 for (IoSplitCodeEntity ioSplitCodeEntity : ioSplitCodeEntities) {
-                    count = IntUtil.value(ioSplitCodeEntity.getRemainCount()) - unCount;
-                    collectOrderCodeAutoService.save(IoCollectOrderCodeAuto.builder()
-                            .codeIdFk(ioSplitCodeEntity.getId())
-                            .udiCode(ioSplitCodeEntity.getCode())
-                            .orderIdFk(collectOrder.getBillNo())
-                            .batchNo(ioSplitCodeEntity.getBatchNo())
-                            .productDate(ioSplitCodeEntity.getProduceDate())
-                            .expireDate(ioSplitCodeEntity.getExpireDate())
-                            .serialNo(ioSplitCodeEntity.getSerialNo())
-                            .relId(collectOrderBiz.getRelId())
-                            .bizIdFk(collectOrderBiz.getId())
-                            .fifoSplit(ioSplitCodeEntity.getFifoSplit())
-                            .createTime(new Date())
-                            .updateTime(new Date())
-                            .build());
-                    if (count > 0) {
-                        ioSplitCodeEntity.setRemainCount(count);
-                        break;
-                    } else if (count == 0) {
-                        ioSplitCodeEntity.setRemainCount(0);
-                    } else {
-                        ioSplitCodeEntity.setRemainCount(0);
-                        unCount = -count;
+                    if (IntUtil.value(ioSplitCodeEntity.getRemainCount()) > 0) {
+                        count = IntUtil.value(ioSplitCodeEntity.getRemainCount()) - unCount;
+                        collectOrderCodeAutoService.save(IoCollectOrderCodeAuto.builder()
+                                .codeIdFk(ioSplitCodeEntity.getId())
+                                .udiCode(ioSplitCodeEntity.getCode())
+                                .orderIdFk(collectOrder.getBillNo())
+                                .batchNo(ioSplitCodeEntity.getBatchNo())
+                                .productDate(ioSplitCodeEntity.getProduceDate())
+                                .expireDate(ioSplitCodeEntity.getExpireDate())
+                                .serialNo(ioSplitCodeEntity.getSerialNo())
+                                .relId(collectOrderBiz.getRelId())
+                                .bizIdFk(collectOrderBiz.getId())
+                                .fifoSplit(ioSplitCodeEntity.getFifoSplit())
+                                .createTime(new Date())
+                                .updateTime(new Date())
+                                .build());
+                        if (count > 0) {
+                            ioSplitCodeEntity.setRemainCount(count);
+                            splitCodeMapper.updateById(ioSplitCodeEntity);
+                            break;
+                        } else if (count == 0) {
+                            ioSplitCodeEntity.setRemainCount(0);
+                            splitCodeMapper.updateById(ioSplitCodeEntity);
+                        } else {
+                            ioSplitCodeEntity.setRemainCount(0);
+                            splitCodeMapper.updateById(ioSplitCodeEntity);
+                            unCount = -count;
+                        }
                     }
                 }
                 if (unCount > 0) {
@@ -371,6 +377,13 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
 
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public void confirmBizAutiTagCode(CollectOrderRequest collectOrderRequest) {
+        IoCollectOrderBiz collectOrderBiz = collectOrderBizService.getById(collectOrderRequest.getId());
+
+
+    }
+
 
     @Resource
     IoSplitFifoInvRelService splitFifoInvRelService;

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

@@ -4630,7 +4630,9 @@ CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'grid',
                          'int NULL DEFAULT NULL COMMENT ''格层标记''',
                          1);
 
-
+CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'freightCode',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''货架code''',
+                         1);
 
 CALL Pro_Temp_ColumnWork('io_collect_set', 'lastCodeSplit',
                          ' tinyint NULL DEFAULT b''1''COMMENT ''是否最后追溯码拆零0:关闭 1:启用''',