1增加仓库Id

src/main/java/com/dk/mdm/mapper/ivt/OutboundItemMapper.xml

@@ -12,7 +12,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
         inv_id, cost_price, cost_amt, flg_valid, cp_id, op_create_time, op_create_user_id,
         op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user,
         s_out_id,s_out_item_id,s_order_id,s_order_item_id,outing_box,outing_piece,out_box,out_piece,
-        unit_id,sub_unit_id, pack_box,sku_name,sku_model,sup_id
+        unit_id,sub_unit_id, pack_box,sku_name,sku_model,sup_id,wh_id
     </sql>
 
     <sql id="Base_Column_List_Response">
@@ -22,7 +22,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
         tpoi.cost_price, tpoi.cost_amt, tpoi.flg_valid, tpoi.cp_id,
         tpoi.s_out_id,tpoi.s_out_item_id,tpoi.s_order_id,tpoi.s_order_item_id,
         tpoi.outing_box,tpoi.outing_piece,tpoi.out_box,tpoi.out_piece,
-        tpoi.unit_id,tpoi.sub_unit_id,tpoi.pack_box,sku_name,sku_model,sup_id
+        tpoi.unit_id,tpoi.sub_unit_id,tpoi.pack_box,sku_name,sku_model,sup_id,wh_id
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -71,6 +71,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
         <result column="sku_model" property="skuModel"/>
         <result column="decimalPlaces" property="decimalPlaces"/>
         <result column="sup_id" property="supId"/>
+        <result column="wh_id" property="whId" typeHandler="UuidTypeHandler"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -262,12 +263,12 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
         ul.unit_name as "unitName",
         u2.unit_name as "subUnitName"
         FROM dkic_b.t_psi_outbound_item as tpoi
+        left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpoi.wh_id
         LEFT JOIN dkic_b.t_mst_supplier as tms ON tpoi.sup_id = tms.sup_id
         LEFT JOIN dkic_b.t_mst_unit AS ul ON tpoi.unit_id = ul.unit_id
         LEFT JOIN dkic_b.t_mst_unit AS u2 ON tpoi.sub_unit_id = u2.unit_id
         left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = tpoi.sku_id
         left join dkic_b.t_psi_inventory as tpi on tpi.inv_id = tpoi.inv_id
-        left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id
         left join sys.t_data_kind as tdk on tdk.kind_code = tpoi.out_status
         left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id = tmgs.brand_id
         <include refid="Condition"/>
@@ -281,9 +282,9 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
         SELECT
         count(1)
         FROM dkic_b.t_psi_outbound_item as tpoi
+        left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpoi.wh_id
         left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = tpoi.sku_id
         left join dkic_b.t_psi_inventory as tpi on tpi.inv_id = tpoi.inv_id
-        left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id
         left join sys.t_data_kind as tdk on tdk.kind_code = tpoi.out_status
         left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id = tmgs.brand_id
         <include refid="Condition"/>
@@ -431,6 +432,7 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                tms.sup_name
                ,t.out_status
         FROM dkic_b.t_psi_outbound_item as t
+                 left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = t.wh_id
                  left join dkic_b.t_mst_supplier as tms on t.sup_id = tms.sup_id
                  left join dkic_b.t_psi_order_item as tpoi on tpoi.item_id = t.from_item_id
                  left join dkic_b.t_psi_order as tpo on tpo.order_id = t.from_id
@@ -438,7 +440,6 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                  left join dkic_b.t_mst_unit as tmgu on t.unit_id = tmgu.unit_id
                  left join dkic_b.t_mst_unit as tmgus on t.sub_unit_id = tmgus.unit_id
                  left join dkic_b.t_psi_inventory as tpi on tpi.inv_id = t.inv_id
-                 left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id
                  left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id = tmgs.brand_id
         where t.flg_valid
           and t.out_id = #{id}::uuid
@@ -481,10 +482,10 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                 ,sys.f_get_name_i18n(tdk.kind_name_i18n, #{i18n}) as "outStatusName"
                 ,t.out_status
         FROM dkic_b.t_psi_outbound_item as t
+                 left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = t.wh_id
                  left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = t.sku_id
                  left join dkic_b.t_mst_unit as tmgu on t.unit_id = tmgu.unit_id
                  left join dkic_b.t_psi_inventory as tpi on tpi.inv_id = t.inv_id
-                 left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id
                  LEFT JOIN dkic_b.t_mst_unit AS ul ON t.unit_id = ul.unit_id
                  LEFT JOIN dkic_b.t_mst_unit AS u2 ON t.sub_unit_id = u2.unit_id
                  left join sys.t_data_kind as tdk on tdk.kind_code = t.out_status
@@ -561,12 +562,12 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                 ,t.out_piece
                 ,t.out_status
         FROM dkic_b.t_psi_outbound_item as t
+                 left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = t.wh_id
                  left join dkic_b.t_mst_unit as tmgu on t.unit_id = tmgu.unit_id
                  left join dkic_b.t_mst_unit as tmgus on t.sub_unit_id = tmgus.unit_id
                  left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = t.sku_id
                  left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id = tmgs.brand_id
                  left join dkic_b.t_psi_inventory tpi on tpi.inv_id = t.inv_id
-                 left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = tpi.wh_id
                  left join dkic_b.t_psi_outbound_item as tpobi on tpobi.item_id = t.s_out_item_id
         where t.flg_valid
           and t.out_id = #{id}::uuid
@@ -615,12 +616,12 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
                 ,t.out_piece
         ,t.out_status
         FROM dkic_b.t_psi_outbound_item as t
+                 left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = t.wh_id
                  left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = t.sku_id
                  left join dkic_b.t_mst_unit as tmgu on t.unit_id = tmgu.unit_id
                  left join dkic_b.t_mst_unit as tmgus on t.sub_unit_id = tmgus.unit_id
                  left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id = tmgs.brand_id
                  left join dkic_b.t_psi_inventory tpi on tpi.inv_id = t.inv_id
-                 left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = tpi.wh_id
                  left join dkic_b.t_psi_outbound_item as tpobi on tpobi.item_id = t.s_out_item_id
         where t.flg_valid
           and t.out_id = #{id}::uuid

src/main/java/com/dk/mdm/model/pojo/ivt/OutboundItem.java

@@ -365,6 +365,11 @@ public class OutboundItem extends PageInfo<OutboundItem> implements Serializable
     @TableField(typeHandler = UuidTypeHandler.class)
     private String supId;
 
+    @Excel(name = "仓库ID")
+    @ApiModelProperty(value = "仓库ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String whId;
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/query/ivt/OutboundItemQuery.java

@@ -237,6 +237,11 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery>{
     @TableField(typeHandler = UuidTypeHandler.class)
     private String supId;
 
+    @Excel(name = "仓库ID")
+    @ApiModelProperty(value = "仓库ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String whId;
+
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/response/ivt/OutboundItemResponse.java

@@ -298,7 +298,9 @@ public class OutboundItemResponse {
     @ApiModelProperty(value = "可出库数量")
     private BigDecimal canOutingQty;
 
+    @Excel(name = "仓库ID")
     @ApiModelProperty(value = "仓库ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
     private String whId;
 
     @Excel(name = "库存数量")

src/main/java/com/dk/mdm/model/vo/ivt/OutboundItemVO.java

@@ -256,9 +256,6 @@ public class OutboundItemVO {
     @ApiModelProperty(value = "已出库金额编辑之前")
     private BigDecimal amtBeforeUpdate;
 
-    @ApiModelProperty(value = "仓库")
-    private String whId;
-
     @ApiModelProperty(value = "新建编辑标识true:新建,false:编辑")
     private Boolean addOrEditFlag;
 
@@ -280,6 +277,11 @@ public class OutboundItemVO {
     @ApiModelProperty(value = "包装")
     private BigDecimal packBox;
 
+    @Excel(name = "仓库ID")
+    @ApiModelProperty(value = "仓库ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String whId;
+
 
 
 

src/main/java/com/dk/mdm/service/ivt/inventory/InventoryService.java

@@ -217,6 +217,10 @@ public class InventoryService extends BaseService<Inventory> {
             if (inventoryBatchVO.getSkuId() == null || "".equals(inventoryBatchVO.getSkuId())) {
                 throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.SKU_IS_NULL.getMessage());
             }
+            //存货ID
+            if (inventoryBatchVO.getInvId() == null || "".equals(inventoryBatchVO.getInvId())) {
+                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.SKU_IS_NOT_IN_INVENTORY.getMessage());
+            }
             //仓库ID
             if (!inventoryBatchVO.getCanNegativeFlag() && (inventoryBatchVO.getWhId() == null || "".equals(inventoryBatchVO.getWhId()))) {
                 throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.WAREHOUSE_IS_NULL.getMessage());