供应商

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

@@ -58,4 +58,14 @@ public class TransferController{
     public ResponseResultVO<?> invalid(@PathVariable String id) {
         return transferService.invalid(id);
     }
+
+    /**
+     * @desc : 通过ID获取库存明细详情
+     * @author : 王英杰
+     * @date : 2024/3/28 15:34
+     */
+    @PostMapping({"/{id}"})
+    public ResponseResultVO selectById(@PathVariable String id) {
+        return transferService.getTransferForUpdate(id);
+    }
 }

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

@@ -73,7 +73,7 @@
         <result column="op_update_time" property="opUpdateTime" typeHandler="TimestampTypeHandler"/>
         <result column="op_update_user_id" property="opUpdateUserId" typeHandler="UuidTypeHandler"/>
         <result column="op_app_code" property="opAppCode"/>
-
+        <result column="sku_images" property="skuImages" typeHandler="JsonTypeHandler"/>
         <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
         <result column="op_db_user" property="opDbUser"/>
         <result column="o_inv_qty" property="oInvQty"/>
@@ -169,6 +169,7 @@
     <select id="selectByCond" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List_Response"/>
+        ,sku.sku_images
         FROM dkic_b.t_psi_check_item AS item
         LEFT JOIN dkic_b.t_mst_goods_sku AS sku ON item.sku_id=sku.sku_id
         LEFT JOIN dkic_b.t_psi_inventory AS inv ON inv.inv_id=item.inv_id

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

@@ -151,7 +151,7 @@
     <select id="selectByCond" resultMap="BaseResultMap_Response">
         SELECT
         <include refid="Base_Column_List_Response"/>
-        FROM t_psi_transfer_item AS item
+        FROM dkic_b.t_psi_transfer_item AS item
         LEFT JOIN dkic_b.t_mst_goods_sku AS sku ON item.sku_id=sku.sku_id
         LEFT JOIN dkic_b.t_psi_inventory AS inv ON inv.inv_id=item.inv_id
         LEFT JOIN dkic_b.t_mst_warehouse AS wh ON wh.wh_id=inv.wh_id
@@ -176,7 +176,7 @@
     <select id="selectById" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_psi_transfer_item
+        FROM dkic_b.t_psi_transfer_item
         WHERE item_id = #{id}::uuid
     </select>
 

src/main/java/com/dk/mdm/mapper/ivt/TransferMapper.java

@@ -4,7 +4,9 @@ import com.dk.mdm.model.pojo.ivt.Transfer;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.ivt.CheckQuery;
 import com.dk.mdm.model.query.ivt.TransferQuery;
+import com.dk.mdm.model.response.ivt.CheckItemResponse;
 import com.dk.mdm.model.response.ivt.TransferResponse;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -28,6 +30,13 @@ public interface TransferMapper extends BaseMapper<Transfer>{
      * @date   : 2024/4/2 9:28
      */
     Long countByCond(TransferQuery transferQuery);
+
+    /**
+     * @desc   : 根据Id进行查询
+     * @author : 王英杰
+     * @date   : 2024/3/19 16:15
+     */
+    TransferResponse selectById(@Param("id") String id);
 	
 }
 

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

@@ -65,6 +65,10 @@
         <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
         <result column="flg_valid" property="flgValid"/>
         <result column="cp_id" property="cpId"/>
+        <result column="oWhName" property="oWhName"/>
+        <result column="whName" property="whName"/>
+        <result column="orgName" property="orgName"/>
+        <result column="staffName" property="staffName"/>
         <result column="annex_paths" property="annexPaths" typeHandler="JsonTypeHandler"/>
         <result column="op_create_time" property="opCreateTime" typeHandler="TimestampTypeHandler"/>
         <result column="op_create_user_id" property="opCreateUserId" typeHandler="UuidTypeHandler"/>
@@ -183,11 +187,15 @@
         </where>
     </sql>
 
-    <!-- 查询表t_psi_transfer，（条件查询+分页）列表 -->
+    <!-- 查询表t_psi_transfer，（条件查询+分页）列表 库存调整 -->
     <select id="selectByCond" resultMap="BaseResultMap_Response">
         SELECT
         <include refid="Base_Column_List_Response"/>
+        ,otmw.wh_name as "oWhName"
+        ,tmw.wh_name as "whName"
         FROM dkic_b.t_psi_transfer AS trf
+        left join   dkic_b.t_mst_warehouse as otmw on otmw.wh_id = trf.o_wh_id
+        left join   dkic_b.t_mst_warehouse as tmw on tmw.wh_id = trf.wh_id
         lEFT JOIN dkic_b.t_mst_staff AS staff ON  staff.staff_id=trf.staff_id
         lEFT JOIN dkic_b.t_mst_org AS org ON org.org_id=trf.org_id
         lEFT JOIN dkic_b.t_mst_staff AS mstaff ON mstaff.staff_id=trf.make_staff
@@ -207,11 +215,21 @@
     </select>
 
     <!-- 根据主键查询表t_psi_transfer的一行数据 -->
-    <select id="selectById" resultMap="BaseResultMap">
+    <select id="selectById" resultMap="BaseResultMap_Response">
         SELECT
-        <include refid="Base_Column_List"/>
-        FROM dkic_b.t_psi_transfer
-        WHERE transfer_id = #{id}::uuid
+        <include refid="Base_Column_List_Response"/>
+        ,otmw.wh_name as "oWhName"
+        ,tmw.wh_name as "whName"
+        ,staff.staff_name AS "staffName"
+        ,org.org_name AS "orgName"
+        FROM dkic_b.t_psi_transfer AS trf
+        left join   dkic_b.t_mst_warehouse as otmw on otmw.wh_id = trf.o_wh_id
+        left join   dkic_b.t_mst_warehouse as tmw on tmw.wh_id = trf.wh_id
+        lEFT JOIN dkic_b.t_mst_staff AS staff ON  staff.staff_id=trf.staff_id
+        lEFT JOIN dkic_b.t_mst_org AS org ON org.org_id=trf.org_id
+        lEFT JOIN dkic_b.t_mst_staff AS mstaff ON mstaff.staff_id=trf.make_staff
+        LEFT JOIN sys.t_data_kind AS tdk  ON tdk.kind_code = trf.transfer_type
+        WHERE trf.transfer_id = #{id}::uuid
     </select>
 
     <!-- 根据主键锁定表t_psi_transfer的一行数据 -->

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

@@ -1,8 +1,10 @@
 package com.dk.mdm.model.response.ivt;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.*;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.JsonTypeHandler;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
@@ -45,6 +47,13 @@ public class CheckItemResponse extends PageInfo<CheckItemResponse> implements Se
     @TableField(typeHandler = UuidTypeHandler.class)
     private String itemId;
 
+    /**
+     * 商品图片 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)
+     */
+    @Excel(name = "商品图片 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
+    @ApiModelProperty(value = "商品图片 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private JSONArray skuImages;
 
     /**
      * 盘点ID

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

@@ -9,6 +9,7 @@ import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -53,6 +54,20 @@ public class TransferResponse extends PageInfo<TransferResponse> implements Seri
     @ApiModelProperty(value = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
     @TableField(typeHandler = JsonTypeHandler.class)
     private JSONArray annexPaths;
+    /**
+     * 仓库名称
+     */
+    @Excel(name = "仓库名称")
+    @ApiModelProperty(value = "仓库名称")
+    private String whName;
+
+    /**
+     * 原仓库名称
+     */
+    @Excel(name = "原仓库名称")
+    @ApiModelProperty(value = "原仓库名称")
+    @JsonProperty(value = "oWhName")
+    private String oWhName;
 
     /**
      * 调整单号
@@ -267,6 +282,17 @@ public class TransferResponse extends PageInfo<TransferResponse> implements Seri
     @ApiModelProperty(value = "制单员")
     private String makeStaffName;
 
+    /**
+     * 组织部门名称
+     */
+    @ApiModelProperty(value = "组织部门")
+    private String orgName;
+
+    /**
+     * 员工名称
+     */
+    @ApiModelProperty(value = "班长")
+    private String staffName;
 
     /*
      * 相关属性

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

@@ -21,10 +21,10 @@ import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.pojo.mac.RecPay;
 import com.dk.mdm.model.pojo.mac.RecPayItem;
 import com.dk.mdm.model.pojo.sale.Order;
+import com.dk.mdm.model.query.ivt.CheckItemQuery;
+import com.dk.mdm.model.query.ivt.TransferItemQuery;
 import com.dk.mdm.model.query.ivt.TransferQuery;
-import com.dk.mdm.model.response.ivt.InboundItemResponse;
-import com.dk.mdm.model.response.ivt.OutboundItemResponse;
-import com.dk.mdm.model.response.ivt.TransferResponse;
+import com.dk.mdm.model.response.ivt.*;
 import com.dk.mdm.model.vo.ivt.*;
 import com.dk.mdm.service.common.CommonService;
 import com.dk.mdm.service.ivt.inbound.InboundCheckService;
@@ -329,4 +329,21 @@ public class TransferService extends BaseService<Transfer> {
 		outboundCheckService.outboundRepeal(id);
 		return ResponseResultUtil.success();
 	}
+
+
+	/**
+	 * @desc   : 通过ID获取编辑调整单信息
+	 * @author : 王英杰
+	 * @date   : 2024/3/28 15:38
+	 */
+	public ResponseResultVO<?> getTransferForUpdate(String id) {
+		Map<String, Object> dataInfo = new HashMap<>();
+		TransferResponse transferResponse = transferMapper.selectById(id);
+		dataInfo.put("data", transferResponse);
+		// 商品明细
+		List<TransferItemResponse> transferItem = transferItemMapper.selectByCond(new TransferItemQuery().setTransferId(id));
+		dataInfo.put("dataItem", transferItem);
+		return ResponseResultUtil.success(dataInfo);
+	}
+
 }