修改强制到仓和撤销到仓请求参数传值方式

sql/v2.1/20241104.sql

 -- 补充菜单脚本
 INSERT INTO `system_menu` (`name`, `permission`, `menu_type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `is_show_in_menu_bar`, `name_en`, `keepalive`, `redirect`, `badge_field`) VALUES ('到仓修改', '', 2, 20, 1559, 'warehousingTo-update', '#', 'ecw/order/warehousingTo', 0, '2702', '2024-11-03 18:52:39', '2702', '2024-11-03 18:59:08', b'0', b'0', '到仓修改', b'0', NULL, NULL);
+
+-- 补充到仓产品信息
+alter table ecw_order_item
+    add COLUMN `check_prod_id` bigint DEFAULT NULL COMMENT '到仓商品ID';
+alter table ecw_order_item
+    add COLUMN `check_prod_type` int DEFAULT NULL COMMENT '到仓产品类型';
+alter table ecw_order_item
+    add COLUMN  `check_prod_title_zh` varchar(255) DEFAULT NULL COMMENT '到仓产品中文标题';
+alter table ecw_order_item
+    add COLUMN  `check_prod_title_en` varchar(255) DEFAULT NULL COMMENT '到仓产品英文标题';

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/dataobject/orderItem/OrderItemDO.java

@@ -417,6 +417,18 @@ public class OrderItemDO extends BaseDO {
     @ApiModelProperty(value = "是否处理了渠道特性异常")
     private Boolean handlerChannelAttrException;
 
+    @ApiModelProperty(value = "到仓商品ID")
+    private Long checkProdId;
+
+    @ApiModelProperty(value = "到仓产品类型")
+    private Integer checkProdType;
+
+    @ApiModelProperty(value = "到仓产品中文标题")
+    private String checkProdTitleZh;
+
+    @ApiModelProperty(value = "到仓产品英文标题")
+    private String checkProdTitleEn;
+
     @ApiModelProperty(value = "到仓材质")
     private String checkMaterial;
 

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderBusinessServiceImpl.java

@@ -4057,6 +4057,10 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
             if (orderItemCheckWarehouseVOMap.containsKey(orderItemDO.getOrderItemId())) {
                 OrderItemCheckWarehouseVO warehouseCheckDO = orderItemCheckWarehouseVOMap.get(orderItemDO.getOrderItemId());
                 WarehouseCheckInfoVO warehouseCheckInfoVO = warehouseCheckDO.getWarehouseCheckInfoVO();
+                orderItemDO.setCheckProdId(warehouseCheckDO.getProdId());
+                orderItemDO.setCheckProdType(warehouseCheckDO.getProdType());
+                orderItemDO.setCheckProdTitleZh(warehouseCheckDO.getProdTitleZh());
+                orderItemDO.setCheckProdTitleEn(warehouseCheckDO.getProdTitleEn());
                 orderItemDO.setCheckBrand(warehouseCheckDO.getCheckBrand());
                 orderItemDO.setCheckBrandType(warehouseCheckDO.getCheckBrandType());
                 orderItemDO.setCheckMaterial(warehouseCheckDO.getCheckMaterial());

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseCheck/OrderWarehouseCheckServiceImpl.java

@@ -194,6 +194,18 @@ public class OrderWarehouseCheckServiceImpl
         Map<Long, OrderItemCheckWarehouseVO> orderItemCheckWarehouseVOMap = new HashMap<>();
         OrderItemCheckWarehouseVO orderItemCheckWarehouseVO = new OrderItemCheckWarehouseVO();
         BeanUtils.copyProperties(orderItemDO, orderItemCheckWarehouseVO);
+        if (Objects.nonNull(checkUpdateReqVO.getProdId())) {
+            orderItemCheckWarehouseVO.setProdId(checkUpdateReqVO.getProdId());
+        }
+        if (Objects.nonNull(checkUpdateReqVO.getProdType())) {
+            orderItemCheckWarehouseVO.setProdType(checkUpdateReqVO.getProdType());
+        }
+        if (StringUtils.isNotBlank(checkUpdateReqVO.getProdTitleZh())) {
+            orderItemCheckWarehouseVO.setProdTitleZh(checkUpdateReqVO.getProdTitleZh());
+        }
+        if (StringUtils.isNotBlank(checkUpdateReqVO.getProdTitleZh())) {
+            orderItemCheckWarehouseVO.setProdTitleEn(checkUpdateReqVO.getProdTitleEn());
+        }
         orderItemCheckWarehouseVO.setCheckBrand(orderItemDO.getBrand());
         orderItemCheckWarehouseVO.setCheckBrandType(orderItemDO.getFeeType());
         orderItemCheckWarehouseVO.setCheckMaterial(orderItemDO.getMaterial());

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderItem/OrderItemBackVO.java

@@ -440,6 +440,18 @@ public class OrderItemBackVO {
     @ApiModelProperty(value = "入仓记录备注，多个用逗号分隔")
     private String warehouseRecordRemark ;
 
+    @ApiModelProperty(value = "到仓商品ID")
+    private Long checkProdId;
+
+    @ApiModelProperty(value = "到仓产品类型")
+    private Integer checkProdType;
+
+    @ApiModelProperty(value = "到仓产品中文标题")
+    private String checkProdTitleZh;
+
+    @ApiModelProperty(value = "到仓产品英文标题")
+    private String checkProdTitleEn;
+
     @ApiModelProperty(value = "到仓材质")
     private String checkMaterial;
 

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderItem/OrderItemBaseVO.java

@@ -293,6 +293,18 @@ public class OrderItemBaseVO {
     @ApiModelProperty(value = "是否处理了渠道特性异常")
     private Boolean handlerChannelAttrException;
 
+    @ApiModelProperty(value = "到仓商品ID")
+    private Long checkProdId;
+
+    @ApiModelProperty(value = "到仓产品类型")
+    private Integer checkProdType;
+
+    @ApiModelProperty(value = "到仓产品中文标题")
+    private String checkProdTitleZh;
+
+    @ApiModelProperty(value = "到仓产品英文标题")
+    private String checkProdTitleEn;
+
     @ApiModelProperty(value = "到仓材质")
     private String checkMaterial;
 
@@ -304,6 +316,7 @@ public class OrderItemBaseVO {
 
     @ApiModelProperty(value = "到仓：0 无牌 1 有牌 2 中性")
     private Integer checkBrandType;
+
     /**
      * 到仓信息json
      */