供应商

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

@@ -10,12 +10,15 @@ import com.dk.mdm.model.response.ivt.InboundResponse;
 import com.dk.mdm.model.response.pur.PurchaseResponse;
 import com.dk.mdm.model.vo.ivt.InboundVO;
 import com.dk.mdm.model.vo.ivt.OutboundVO;
+import com.dk.mdm.service.ivt.InboundPurchaseService;
 import com.dk.mdm.service.ivt.InboundService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
+
 
 @Api(tags = "入库单API接口")
 @RestController
@@ -30,6 +33,8 @@ public class InboundController{
     private InboundService inboundService;
 
 
+    @Autowired
+    private InboundPurchaseService inheritedPurchaseService;
 
     /**
      * @desc   : 条件查询
@@ -41,7 +46,7 @@ public class InboundController{
             notes = "分页、关联、条件查询"
     )
     @PostMapping({"list_by"})
-    public ResponseResultVO<PageList<PurchaseResponse>> selectByCond(@RequestBody InboundQuery inboundQuery) {
+    public ResponseResultVO<PageList<InboundResponse>> selectByCond(@RequestBody InboundQuery inboundQuery) {
         return inboundService.selectByCond(inboundQuery);
     }
 
@@ -77,5 +82,18 @@ public class InboundController{
         return inboundService.insert(inboundVO);
     }
 
+    /**
+     * @desc   : 采购入库新建
+     * @date   : 2024/3/7 14:00
+     * @author : 王英杰
+     */
+    @ApiOperation(
+            value = "采购入库新建",
+            notes = "采购入库新建"
+    )
+    @PostMapping({"purchase_inbound_insert"})
+    public ResponseResultVO<?> purchaseInboundInsert(@Valid @RequestBody InboundVO inboundVO) {
+        return inheritedPurchaseService.purchaseInboundInsert(inboundVO);
+    }
 
 }

src/main/java/com/dk/mdm/controller/pur/PurchaseController.java

@@ -95,7 +95,7 @@ public class PurchaseController{
         return purchaseService.update(Purchasevo);
     }
     /**
-     * @desc   : 采购订单 转 采购入库
+     * @desc   : 采购订单 转 采购入库   （目前废弃）
      * @author : 王英杰
      * @date   : 2024年3月11日
      */

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

@@ -54,7 +54,7 @@ public interface InboundMapper extends BaseMapper<Inbound>{
      * @author : 王英杰
      * @date   : 2024/3/8 10:58
      */
-    List<PurchaseResponse> selectByCond(InboundQuery inboundQuery);
+    List<InboundResponse> selectByCond(InboundQuery inboundQuery);
 
     /**
      * @desc   : 条件查询个数 (采购入库用)

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

@@ -142,6 +142,7 @@
     <resultMap id="purchaseItemListMap" type="java.util.Map">
         <id column="item_id" property="itemId"/>
         <result column="pur_id" property="purId" typeHandler="UuidTypeHandler"/>
+        <result column="pur_no" property="purNo"/>
         <result column="item_index" property="itemIndex"/>
         <result column="sku_id" property="skuId" typeHandler="UuidTypeHandler"/>
         <result column="item_qty" property="itemQty"/>
@@ -456,6 +457,7 @@
     <sql id="Base_Column_List_Item_Response_Join">
         ,tppi.item_id  as "List_item_id",
         tppi.pur_id  as "List_pur_id",
+        tpp.pur_no as "List_pur_no",
         tppi.item_index as "List_item_index",
         tppi.sku_id as "List_sku_id",
         tppi.item_qty as "List_item_qty",

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

@@ -59,7 +59,7 @@ public class InboundService extends BaseService<Inbound> {
 	 * @date   : 2024/3/8 10:58
 	 */
 	@Pagination
-	public ResponseResultVO<PageList<PurchaseResponse>> selectByCond(InboundQuery inboundQuery) {
+	public ResponseResultVO<PageList<InboundResponse>> selectByCond(InboundQuery inboundQuery) {
 		return super.mergeListWithCount(inboundQuery, inboundMapper.selectByCond(inboundQuery), inboundMapper.countByCond(inboundQuery));
 	}
 

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

@@ -230,7 +230,7 @@ public class PurchaseService extends BaseService<Purchase> {
     }
 
     /**
-     * @desc : 采购订单 转 采购入库
+     * @desc : 采购订单 转 采购入库   （目前废弃）
      * @author : 王英杰
      * @date : 2024年3月11日
      */
@@ -265,7 +265,7 @@ public class PurchaseService extends BaseService<Purchase> {
     }
 
     /**
-     * @desc :  采购订单实体数据 转 入库单数据
+     * @desc :  采购订单实体数据 转 入库单数据 （目前废弃）
      * @author : 王英杰
      * @date : 2024年3月11日
      */
@@ -294,7 +294,7 @@ public class PurchaseService extends BaseService<Purchase> {
         return inboundVO;
     }
     /**
-     * @desc :  采购订单明细实体数据 转 入库单明细数据
+     * @desc :  采购订单明细实体数据 转 入库单明细数据 （目前废弃）
      * @author : 王英杰
      * @date : 2024年3月11日
      */