订单明细添加选择源单接口

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

@@ -7,8 +7,10 @@ import com.dk.common.controller.BaseController;
 import com.dk.common.service.BaseService;
 import com.dk.mdm.model.query.pur.PurchaseItemQuery;
 import com.dk.mdm.model.query.sale.OrderItemQuery;
+import com.dk.mdm.model.query.sale.OrderQuery;
 import com.dk.mdm.model.response.pur.PurchaseItemResponse;
 import com.dk.mdm.model.response.sale.OrderItemResponse;
+import com.dk.mdm.model.response.sale.OrderResponse;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -18,6 +20,8 @@ import org.springframework.web.bind.annotation.RestController;
 import io.swagger.annotations.Api;
 import com.dk.mdm.service.sale.OrderItemService;
 
+import java.util.List;
+
 @Api(tags = "销售明细API接口")
 @RestController
 @RequestMapping("/sale/orderItem")
@@ -58,4 +62,28 @@ public class OrderItemController{
         return orderItemService.purchaseBasedOnSaleSelectOrder(orderItemQuery);
     }
 
+
+    /**
+     * @desc   : 销售出库页面选择源单条件查询分页
+     * @date   : 2024/6/27 14:12
+     * @author : 寇珊珊
+     */
+    @ApiOperation(value = "销售出库页面选择源单条件查询分页", notes = "销售出库页面选择源单条件查询分页")
+    @PostMapping({"select_by_sale_out_by_page"})
+    public ResponseResultVO<PageList<OrderItemResponse>> selectBySaleOutByPage(@RequestBody OrderItemQuery orderItemQuery) {
+        return orderItemService.selectBySaleOutByPage(orderItemQuery);
+    }
+
+
+    /**
+     * @desc   : 销售出库页面选择源单
+     * @date   : 2024/6/27 14:12
+     * @author : 寇珊珊
+     */
+    @ApiOperation(value = "销售出库页面选择源单", notes = "销售出库页面选择源单")
+    @PostMapping({"select_by_sale_out"})
+    public ResponseResultVO<List<OrderItemResponse>> selectBySaleOut(@RequestBody OrderItemQuery orderItemQuery) {
+        return orderItemService.selectBySaleOut(orderItemQuery);
+    }
+
 }

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

@@ -4,8 +4,10 @@ import com.dk.mdm.model.pojo.ivt.OutboundItem;
 import com.dk.mdm.model.pojo.sale.OrderItem;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.sale.OrderItemQuery;
+import com.dk.mdm.model.query.sale.OrderQuery;
 import com.dk.mdm.model.response.ivt.IntoReturnResponse;
 import com.dk.mdm.model.response.sale.OrderItemResponse;
+import com.dk.mdm.model.response.sale.OrderResponse;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -88,5 +90,19 @@ public interface OrderItemMapper extends BaseMapper<OrderItem> {
      * @date   : 2024/3/29 16:26
      */
     Long  purchaseBasedOnSaleContByCond (OrderItemQuery orderItemQuery);
+
+    /**
+     * @desc   : 销售出库页面选择源单
+     * @date   : 2024/6/27 14:10
+     * @author : 寇珊珊
+     */
+    List<OrderItemResponse> selectBySaleOut(OrderItemQuery orderItemQuery);
+
+    /**
+     * @desc   : 销售出库页面选择源单（数量）
+     * @date   : 2024/6/27 14:10
+     * @author : 寇珊珊
+     */
+    Long selectBySaleOutByCound(OrderItemQuery orderItemQuery);
 }
 

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

@@ -696,4 +696,55 @@
             limit #{end} offset #{start}
         </if>
     </select>
+
+    <!-- 销售出库页面选择源单 -->
+    <select id="selectBySaleOut" resultMap="BaseResultMapResponse">
+        SELECT
+        <include refid="Base_Column_List_Response"/>,
+        tmc.cus_code as "cusCode",
+        tmc.cus_name as "cusName",
+        tmc.cus_phone as "cusPhone",
+        tmc.address_full as "addressFull",
+        tmsc.channel_name as "channelName",
+        tmgs.sku_code AS "skuCode",
+        tmgs.sku_model AS "skuModel",
+        tmgs.sku_name AS "skuName",
+        tmgb.brand_name AS "brandName",
+        tmgb.short_name AS "shortName"
+        FROM dkic_b.t_psi_order_item t
+        LEFT JOIN dkic_b.t_psi_order as tpo ON t.order_id = tpo.order_id
+        LEFT JOIN dkic_b.t_mst_customer tmc ON tmc.cus_id = tpo.cus_id
+        LEFT JOIN dkic_b.t_mst_sale_channel tmsc ON tpo.sales_channel = tmsc.channel_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
+        WHERE
+        t.cp_id = #{cpId}
+        and t.item_qty - t.outing_qty - t.out_qty  > 0
+        <if test="orderNo != null">
+            AND tpo.order_no like concat('%', my_ex.likequery(#{orderNo}) , '%')
+        </if>
+        order by t.op_create_time desc
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+    </select>
+
+    <!-- 销售出库页面选择源单个数 -->
+    <select id="selectBySaleOutByCound" resultMap="BaseResultMapResponse">
+        SELECT
+        count(1)
+        FROM dkic_b.t_psi_order_item t
+        LEFT JOIN dkic_b.t_psi_order as tpo ON t.order_id = tpo.order_id
+        LEFT JOIN dkic_b.t_mst_customer tmc ON tmc.cus_id = tpo.cus_id
+        LEFT JOIN dkic_b.t_mst_sale_channel tmsc ON tpo.sales_channel = tmsc.channel_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
+        WHERE
+        t.cp_id = #{cpId}
+         and t.item_qty - t.outing_qty - t.out_qty  > 0
+        <if test="orderNo != null">
+            AND tpo.order_no like concat('%', my_ex.likequery(#{orderNo}) , '%')
+        </if>
+    </select>
+
 </mapper>

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleOrderService.java

@@ -250,7 +250,6 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                     accountService.reversePayable(inboundResponse.getIntoId(), Constant.InventoryDocCode.INTOBOUND.getTableName());
                 }
             }
-
             //删除外协入库单
             //外协入库总单
             inboundMapper.deleteByFromId(outboundItemVOList.get(0).getOutId());
@@ -878,7 +877,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
             }
             //endregion
 
-            //region 入库中编辑
+            //region 出库中编辑
             if (Constant.OutStatus.CHUKUZHONG.getName().equals(outboundVO.getOutStatus()) ||
                     Constant.OutStatus.DAICHUKU.getName().equals(outboundVO.getOutStatus())) {
                 //region 修改明细

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

@@ -10,8 +10,10 @@ 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.sale.OrderItemQuery;
+import com.dk.mdm.model.query.sale.OrderQuery;
 import com.dk.mdm.model.response.pur.PurchaseItemResponse;
 import com.dk.mdm.model.response.sale.OrderItemResponse;
+import com.dk.mdm.model.response.sale.OrderResponse;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -58,4 +60,24 @@ public class OrderItemService extends BaseService<OrderItem> {
 		return ResponseResultUtil.success(new PageList<>(items, count));
 	}
 
+	/**
+	 * @desc   : 销售出库页面选择源单条件查询分页
+	 * @date   : 2024/6/27 14:13
+	 * @author : 寇珊珊
+	 */
+	@Pagination
+	public ResponseResultVO<PageList<OrderItemResponse>> selectBySaleOutByPage(OrderItemQuery orderItemQuery) {
+		return super.mergeListWithCount(orderItemQuery, orderItemMapper.selectBySaleOut(orderItemQuery),
+				orderItemMapper.selectBySaleOutByCound(orderItemQuery));
+	}
+
+	/**
+	 * @desc   : 销售出库页面选择源单条件查询
+	 * @date   : 2024/6/27 14:13
+	 * @author : 寇珊珊
+	 */
+	public ResponseResultVO<List<OrderItemResponse>> selectBySaleOut(OrderItemQuery orderItemQuery) {
+		return ResponseResultUtil.success(orderItemMapper.selectBySaleOut(orderItemQuery));
+	}
+
 }