采购订单

src/main/java/com/dk/mdm/mapper/pur/PurchaseMapper.java

@@ -31,6 +31,13 @@ public interface PurchaseMapper extends BaseMapper<Purchase>{
      */
     Long countByCond(PurchaseQuery purchaseQuery);
 
+    /**
+     * @desc   : 根据id查询
+     * @date   : 2023/6/28 14:06
+     * @author : 寇珊珊
+     */
+    PurchaseResponse  selectById(@Param("purId") String purId);
+
 
     /**
      * @desc   : 获取单号

src/main/java/com/dk/mdm/mapper/pur/PurchaseMapper.xml

@@ -54,7 +54,7 @@
     </sql>
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.dk.mdm.model.response.pur.PurchaseResponse">
+    <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.pur.Purchase">
         <id column="pur_id" property="purId"/>
                 <result column="pur_no" property="purNo"/>
                 <result column="pur_type" property="purType"/>
@@ -92,6 +92,49 @@
                 <result column="op_app_code" property="opAppCode"/>
             <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
                 <result column="op_db_user" property="opDbUser"/>
+                <result column="wh_id" property="whId"/>
+    </resultMap>
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMapResponse" type="com.dk.mdm.model.response.pur.PurchaseResponse">
+        <id column="pur_id" property="purId"/>
+        <result column="pur_no" property="purNo"/>
+        <result column="pur_type" property="purType"/>
+        <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
+        <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
+        <result column="sup_id" property="supId" typeHandler="UuidTypeHandler"/>
+        <result column="contact_name" property="contactName"/>
+        <result column="contact_phone" property="contactPhone"/>
+        <result column="pickup_date" property="pickupDate" typeHandler="TimestampTypeHandler"/>
+        <result column="sum_quantity" property="sumQuantity"/>
+        <result column="sum_standard" property="sumStandard"/>
+        <result column="sum_amount" property="sumAmount"/>
+        <result column="pur_discount" property="purDiscount"/>
+        <result column="pur_status" property="purStatus"/>
+        <result column="into_status" property="intoStatus"/>
+        <result column="intoing_qty" property="intoingQty"/>
+        <result column="intoing_amt" property="intoingAmt"/>
+        <result column="into_qty" property="intoQty"/>
+        <result column="into_amt" property="intoAmt"/>
+        <result column="return_qty" property="returnQty"/>
+        <result column="return_amt" property="returnAmt"/>
+        <result column="amt_payable" property="amtPayable"/>
+        <result column="amt_handle" property="amtHandle"/>
+        <result column="amt_residue" property="amtResidue"/>
+        <result column="remarks" property="remarks"/>
+        <result column="annex_paths" property="annexPaths" typeHandler="JsonTypeHandler"/>
+        <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
+        <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
+        <result column="flg_valid" property="flgValid"/>
+        <result column="cp_id" property="cpId"/>
+        <result column="op_create_time" property="opCreateTime" typeHandler="TimestampTypeHandler"/>
+        <result column="op_create_user_id" property="opCreateUserId" typeHandler="UuidTypeHandler"/>
+        <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="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
+        <result column="op_db_user" property="opDbUser"/>
+        <result column="wh_id" property="whId"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -331,7 +374,7 @@
     </sql>
 
     <!-- 查询表dkic_b.t_psi_purchase，（条件查询+分页）列表 -->
-    <select id="selectByCond" resultMap="BaseResultMap">
+    <select id="selectByCond" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List_Left_join"/>
         ,tmo.org_name as "orgName"
@@ -349,7 +392,7 @@
 
 
     <!-- 根据主键查询表dkic_b.t_psi_purchase的一行数据 -->
-    <select id="selectById" resultMap="BaseResultMap">
+    <select id="selectById" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_psi_purchase
@@ -384,7 +427,7 @@
 
     <!--    获取单号-->
     <select id="getDocNo" resultType="java.lang.String">
-        select f_create_doc_no(#{cpId}, #{purId}, #{docCode})
+        select dkic_b.f_create_note(#{cpId}, #{purId}::uuid, #{docCode})
     </select>
 
     <!--修改采购订单号-->

src/main/java/com/dk/mdm/model/pojo/pur/Purchase.java

@@ -18,6 +18,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.alibaba.fastjson.JSONObject;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.List;
 import java.time.LocalDateTime;
 
@@ -111,9 +112,9 @@ public class Purchase extends PageInfo<Purchase> implements Serializable {
      */
     @Excel(name = "取货日期")
     @ApiModelProperty(value = "取货日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime pickupDate;
+    private LocalDate pickupDate;
 
 
     /**
@@ -351,6 +352,14 @@ public class Purchase extends PageInfo<Purchase> implements Serializable {
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
+    /**
+     * 仓库
+     */
+    @Excel(name = "仓库")
+    @ApiModelProperty(value = "仓库ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String whId;
+
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/query/pur/PurchaseQuery.java

@@ -22,6 +22,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -114,9 +115,9 @@ public class PurchaseQuery extends PageInfo<PurchaseQuery> implements Serializab
      */
     @Excel(name = "取货日期")
     @ApiModelProperty(value = "取货日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime pickupDate;
+    private LocalDate pickupDate;
 
 
     /**
@@ -354,6 +355,14 @@ public class PurchaseQuery extends PageInfo<PurchaseQuery> implements Serializab
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
+    /**
+     * 仓库
+     */
+    @Excel(name = "仓库")
+    @ApiModelProperty(value = "仓库ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String whId;
+
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/response/pur/PurchaseResponse.java

@@ -25,6 +25,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  *  采购订单
@@ -377,6 +378,18 @@ public class PurchaseResponse extends PageInfo<PurchaseResponse> implements Seri
     @ApiModelProperty(value = "制单员")
     private String makeStaffName;
 
+    /**
+     * 仓库
+     */
+    @Excel(name = "仓库")
+    @ApiModelProperty(value = "仓库ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String whId;
+
+
+    @ApiModelProperty(value = "采购订单明细")
+    private List<PurchaseItemResponse> purchaseItemResponseList;
+
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/mdm/model/vo/pur/PurchaseVO.java

@@ -22,6 +22,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -114,9 +115,9 @@ public class PurchaseVO extends PageInfo<PurchaseVO> implements Serializable {
      */
     @Excel(name = "取货日期")
     @ApiModelProperty(value = "取货日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime pickupDate;
+    private LocalDate pickupDate;
 
 
     /**
@@ -354,6 +355,14 @@ public class PurchaseVO extends PageInfo<PurchaseVO> implements Serializable {
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
+    /**
+     * 仓库
+     */
+    @Excel(name = "仓库")
+    @ApiModelProperty(value = "仓库ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String whId;
+
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/service/pur/PurchaseService.java

@@ -10,12 +10,15 @@ import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.infrastructure.convert.pur.PurChaseConvert;
+import com.dk.mdm.mapper.pur.PurchaseItemMapper;
 import com.dk.mdm.model.pojo.mst.Staff;
 import com.dk.mdm.model.pojo.pur.Purchase;
 import com.dk.mdm.mapper.pur.PurchaseMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.pur.PurchaseItemQuery;
 import com.dk.mdm.model.query.pur.PurchaseQuery;
+import com.dk.mdm.model.response.pur.PurchaseItemResponse;
 import com.dk.mdm.model.response.pur.PurchaseResponse;
 import com.dk.mdm.model.vo.mst.StaffVO;
 import com.dk.mdm.model.vo.pur.PurchaseVO;
@@ -26,6 +29,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -44,6 +48,9 @@ public class PurchaseService extends BaseService<Purchase> {
 	@Autowired
 	private PurChaseConvert purChaseConvert;
 
+	@Autowired
+	private PurchaseItemMapper purchaseItemMapper;
+
 	/**
 	 * @desc   : 条件查询
 	 * @author : 常皓宁
@@ -84,6 +91,7 @@ public class PurchaseService extends BaseService<Purchase> {
 		purchasevo.setMakeTime(LocalDateTime.now());
 		purchasevo.setPurType(Constant.DocumentType.PUR_CHASE.getName());
 		Purchase purchase = purChaseConvert.convertToPo(purchasevo);
+		purchase.setPurNo("CS");//先随便塞个值 要不不能新建
 		purchaseMapper.insert(purchase);
 		purchasevo.setPurId(purchase.getPurId());
 		purchasevo.setPurNo(purchaseMapper.getDocNo(purchasevo.getCpId(),purchase.getPurId(),Constant.DocumentType.PUR_CHASE.getName()));
@@ -93,6 +101,25 @@ public class PurchaseService extends BaseService<Purchase> {
 	}
 
 	/**
+	 * @desc   : 根据总单id查询
+	 * @author : 常皓宁
+	 * @date   : 2024/2/29 9:56
+	 */
+	public ResponseResultVO selectById(String purId) {
+		//根据id查询
+		PurchaseResponse purchaseResponse = purchaseMapper.selectById(purId);
+		//不存在
+		if (purchaseResponse == null) {
+			return ResponseResultUtil.error(ErrorCodeEnum.PURCHASE_CANNOT_BE_EMPTY.getCode(),
+					ErrorCodeEnum.PURCHASE_CANNOT_BE_EMPTY.getMessage());
+		}
+		//查询明细
+		List<PurchaseItemResponse> purchaseItemResponses = purchaseItemMapper.selectByCond(new PurchaseItemQuery().setPurId(purId));
+		purchaseResponse.setPurchaseItemResponseList(purchaseItemResponses);
+		return ResponseResultUtil.success(purchaseResponse);
+	}
+
+	/**
 	 * @desc   : 编辑方法
 	 * @author : 常皓宁
 	 * @date   : 2024/2/28 10:57