采购订单修改

src/main/java/com/dk/mdm/controller/sale/OrderItemController.java

@@ -29,9 +29,9 @@ public class OrderItemController{
     private OrderItemService orderItemService;
 
     /**
-     * @desc   : 以销定采查询销售订单接口（新建编辑使用）
-     * @date   : 2023/8/18 15:34
-     * @author : 寇珊珊
+     * @desc   : 以销定采查询销售订单接口
+     * @author : 常皓宁
+     * @date   : 2024/3/29 16:26
      */
     @ApiOperation(
             value = "以销定采查询销售订单接口（新建编辑使用）",

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

@@ -38,7 +38,9 @@
         tppi.op_update_user_id,
         tppi.op_app_code,
         tppi.op_timestamp,
-        tppi.op_db_user
+        tppi.op_db_user,
+        tppi.from_id,
+        tppi.from_item_id
     </sql>
 
     <!-- 通用查询映射结果 -->

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

@@ -51,7 +51,9 @@
         tpp.op_app_code,
         tpp.op_timestamp,
         tpp.op_db_user,
-        tpp.wh_id
+        tpp.wh_id,
+        tpp.from_ids,
+        tpp.from_nos
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -145,6 +147,8 @@
         <result column="intoStatusName" property="intoStatusName"/>
         <result column="purStatusName" property="purStatusName"/>
         <result column="returnAddress" property="returnAddress"/>
+        <result column="from_ids" property="fromIds" typeHandler="StringListTypeHandler"/>
+        <result column="from_nos" property="fromNos" typeHandler="StringListTypeHandler"/>
 
         <collection property="purchaseItemResponseList" resultMap="purchaseItemListMap" columnPrefix="list_"/>
     </resultMap>

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.java

@@ -67,16 +67,16 @@ public interface OrderItemMapper extends BaseMapper<OrderItem> {
 
     /**
      * @desc   : 以销定采查询订单明细---web用
-     * @date   : 2023/8/23 15:43
-     * @author : 寇珊珊
+     * @author : 常皓宁
+     * @date   : 2024/3/29 16:26
      */
     List<OrderItemResponse> purchaseBasedOnSaleSelectByCond (OrderItemQuery orderItemQuery);
 
 
     /**
      * @desc   : 以销定采查询订单明细个数---web用
-     * @date   : 2023/8/23 15:43
-     * @author : 寇珊珊
+     * @author : 常皓宁
+     * @date   : 2024/3/29 16:26
      */
     Long  purchaseBasedOnSaleContByCond (OrderItemQuery orderItemQuery);
 }

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.xml

@@ -512,7 +512,12 @@
         inner join dkic_b.t_mst_goods_sku tmgs on t.sku_id = tmgs.sku_id
         left join(select from_item_id,sum(item_qty) as sumQty from t_psi_purchase_item
             group by from_item_id) as pi on pi.from_item_id = t.item_id
-        <include refid="Condition_pur"/>
+        <where>
+            t.item_qty - coalesce(sumQty,0) > 0
+            <if test="orderNo != null">
+                AND tpo.order_no like concat('%', my_ex.likequery(#{orderNo}) , '%')
+            </if>
+        </where>
         order by t.item_id
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
@@ -525,7 +530,14 @@
         FROM dkic_b.t_psi_order_item as t
         left join dkic_b.t_psi_order as tpo on tpo.order_id = t.order_id
         inner join dkic_b.t_mst_goods_sku tmgs on t.sku_id = tmgs.sku_id
-        <include refid="Condition_pur"/>
+        left join(select from_item_id,sum(item_qty) as sumQty from t_psi_purchase_item
+        group by from_item_id) as pi on pi.from_item_id = t.item_id
+        <where>
+            t.item_qty - coalesce(sumQty,0) > 0
+            <if test="orderNo != null">
+                AND tpo.order_no like concat('%', my_ex.likequery(#{orderNo}) , '%')
+            </if>
+        </where>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
         </if>

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

@@ -8,9 +8,7 @@ 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.JsonTypeHandler;
-import com.dk.common.infrastructure.handler.TimestampTypeHandler;
-import com.dk.common.infrastructure.handler.UuidTypeHandler;
+import com.dk.common.infrastructure.handler.*;
 import com.dk.common.model.pojo.PageInfo;
 import com.dk.mdm.model.response.ivt.InboundItemResponse;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -427,6 +425,17 @@ public class PurchaseResponse extends PageInfo<PurchaseResponse> implements Seri
     @ApiModelProperty(value = "供应商地址")
     private String returnAddress;
 
+    @ApiModelProperty(value = "来源单id")
+    @TableField(typeHandler = UuidListTypeHandler.class)
+    private List<String> fromIds;
+    /**
+     *来源单号
+     */
+
+    @TableField(typeHandler = StringListTypeHandler.class)
+    @ApiModelProperty(value = "来源单号")
+    private List<String> fromNos;
+
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/service/sale/OrderItemService.java

@@ -35,8 +35,8 @@ public class OrderItemService extends BaseService<OrderItem> {
 
 	/**
 	 * @desc   : 以销定采查询销售订单接口
-	 * @date   : 2023/8/23 15:39
-	 * @author : 寇珊珊
+	 * @author : 常皓宁
+	 * @date   : 2024/3/29 16:26
 	 */
 	@Pagination
 	public ResponseResultVO<PageList<OrderItemResponse>> purchaseBasedOnSaleSelectOrder(OrderItemQuery orderItemQuery) {