理货补单日志文案逻辑补充

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/enums/OrderShipmentLog.java

@@ -4,6 +4,7 @@ public enum OrderShipmentLog {
     PRELOAD_ADD("添加预装"),
     PRELOAD_REMOVE("移出预装单"),
     TALLY("理货"),
+    TALLY_PATCH("理货补单"),
     CABINET_SPLIT_REQUEST("提交装柜拆单申请"),
     CABINET_SPLIT_RESULT_FAIL("提交装柜拆单失败"),
     CABINET_SPLIT_RESULT_SUCCESS("提交装柜拆单通过"),

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxPreloadGoods/BoxPreloadGoodsServiceImpl.java

@@ -404,7 +404,7 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
             }
             //生成提单号
             boxService.generateBillLadingNo(shipmentId, false, false);
-            boxService.addOrderLog(orderIdList, OrderShipmentLog.CABINET_PATCH, "");
+            boxService.addOrderLog(orderIdList, createReqVO.getIsTally() == 0 ? OrderShipmentLog.CABINET_PATCH : OrderShipmentLog.TALLY_PATCH, "");
         } else {
             for (Long oId : orderIdList) {
                 boxService.updateOrderStatus(oId, null, null,
@@ -2515,7 +2515,7 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
             //生成提单号
             boxService.generateBillLadingNo(shipmentId, true, false);
 
-            boxService.addOrderLog(orderIdList, OrderShipmentLog.MERGE_PATCH, "");
+            boxService.addOrderLog(orderIdList, createReqVO.getIsTally() == 0 ? OrderShipmentLog.MERGE_PATCH : OrderShipmentLog.TALLY_PATCH, "");
         } else {
             for (Long oId : orderIdList) {
                 boxService.updateOrderStatus(oId, null, null,
@@ -2856,7 +2856,7 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
                                 OrderApprovalTypeCheckEvent guanLianApprovalTypeCheckEvent = new OrderApprovalTypeCheckEvent(o.getOrderId(), null, null, Arrays.asList(6, 11, 13, 14, 22, 23), false);
                                 applicationContext.publishEvent(guanLianApprovalTypeCheckEvent);
                                 return guanLianApprovalTypeCheckEvent.getResult();
-                            }else {
+                            } else {
                                 // 关联单有异常或未完成入仓
                                 return true;
                             }

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/vo/boxPreloadGoods/BoxPreloadGoodsCreateReqVO.java

@@ -28,6 +28,9 @@ public class BoxPreloadGoodsCreateReqVO {
     @ApiModelProperty(value = "是否是补单，0-不是，1-是")
     private Integer isCover = 0;
 
+    @ApiModelProperty(value = "是否是理货补单，0-不是，1-是")
+    private Integer isTally = 0;
+
     @ApiModelProperty(value = "关联关系，1-不校验互斥, 2-不校验关联")
     private Integer relationStatus;