入库单

src/main/java/com/dk/mdm/controller/ivt/InboundController.java

@@ -95,5 +95,18 @@ public class InboundController{
     public ResponseResultVO<?> purchaseInboundInsert(@Valid @RequestBody InboundVO inboundVO) {
         return inheritedPurchaseService.purchaseInboundInsert(inboundVO);
     }
+    /**
+     * @desc   : 采购入库办理
+     * @date   : 2024/3/7 15:34
+     * @author : 王英杰
+     */
+    @ApiOperation(
+            value = "采购入库办理",
+            notes = "采购入库办理"
+    )
+    @PostMapping({"purchase_handle_inbound"})
+    public ResponseResultVO<?> purchaseHandleInbound(@RequestBody InboundVO inboundVO) {
+        return inheritedPurchaseService.purchaseHandleInbound(inboundVO);
+    }
 
 }

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

@@ -136,11 +136,17 @@
         ,tmgs.sku_code  as "skuCode"
         ,tmgs.sku_model as "skuModel"
         ,tmgs.sku_name  as "skuName"
+        ,tmgs.sku_spec  as "skuSpec"
         ,tmgb.brand_name  as "brandName"
         ,tmgb.short_name  as "shortName"
+        ,tmw.wh_id as "whId"
+        ,tmw.wh_code as "whCode"
+        ,tmw.wh_name as "whName"
         FROM dkic_b.t_psi_inbound_item tpii
         left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = tpii.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 = tpii.inv_id
+        left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = tpi.wh_id
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}

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

@@ -1,7 +1,9 @@
 package com.dk.mdm.model.response.ivt;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
@@ -52,6 +54,12 @@ public class InboundItemResponse extends PageInfo<InboundItemResponse> implement
     @ApiModelProperty(value = "入库ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String intoId;
+    /**
+     * 商品规格
+     */
+    @Excel(name = "商品规格")
+    @ApiModelProperty(value = "商品规格")
+    private String skuSpec;
 
 
     /**
@@ -341,8 +349,30 @@ public class InboundItemResponse extends PageInfo<InboundItemResponse> implement
      * 关联属性 + 查询条件
      * @TableField(exist = false)
      */
+    /**
+     * 仓库ID
+     */
+    @TableId(value = "wh_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "仓库ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String whId;
+
+
+    /**
+     * 仓库编号
+     */
+    @Excel(name = "仓库编号")
+    @ApiModelProperty(value = "仓库编号")
+    private String whCode;
 
 
+    /**
+     * 仓库名称
+     */
+    @Excel(name = "仓库名称")
+    @ApiModelProperty(value = "仓库名称")
+    private String whName;
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/service/ivt/InboundPurchaseService.java

@@ -238,7 +238,7 @@ public class InboundPurchaseService extends BaseService<Inbound> {
 			}
 			for (InboundItemVO inboundItemVO : inboundVO.getItemList()) {
 				if (inboundItemVO.getIntoId() != null) {
-					InboundItemResponse inboundItemResponse = inboundItemMapper.selectById(inboundItemVO.getIntoId());
+					InboundItemResponse inboundItemResponse = inboundItemMapper.selectById(inboundItemVO.getItemId());
 					//编辑明细
 					inboundItemVO
 							.setIntoQty(inboundItemResponse.getIntoQty().add(inboundItemVO.getIntoingQty()))