供应商

src/main/java/com/dk/mdm/controller/mst/OrgController.java

@@ -43,7 +43,6 @@ public class OrgController{
        */
     @ApiOperation( value = "新建组织部门", notes = "新建组织部门" )
     @PostMapping({"insert"})
-    @Transactional(rollbackFor = Exception.class)
     public ResponseResultVO<?> insert(@RequestBody OrgVO orgVO) {
         return orgService.insert(orgVO);
     }
@@ -56,7 +55,6 @@ public class OrgController{
      */
     @ApiOperation( value = "新建组织部门", notes = "新建组织部门" )
     @PostMapping({"insert_feign_org"})
-    @Transactional(rollbackFor = Exception.class)
     public ResponseResultVO<?> insertFeignOrg(@RequestBody OrgVO orgVO) {
         return orgService.insertFeignOrg(orgVO);
     }

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

@@ -203,7 +203,16 @@
         ,tmw.wh_id as "whId"
         ,tmw.wh_code as "whCode"
         ,tmw.wh_name as "whName"
+        ,tpp.pur_id as "purId"
+        ,tpp.pur_no as "purNo"
+        ,tppi.item_qty as "purItemQty"
+        ,tppi.intoing_qty as "purItemIntoingQty"
+        ,tppi.into_qty as "purItemIntoQty"
+        ,tpiv.inv_qty
         FROM dkic_b.t_psi_inbound_item tpii
+        left join dkic_b.t_psi_inventory tpiv on tpiv.inv_id = tpii.inv_id
+        left join dkic_b.t_psi_purchase_item tppi on tppi.item_id = tpii.from_item_id
+        left join dkic_b.t_psi_purchase tpp on tpp.pur_id = tpii.from_id
         left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = tpii.sku_id
         left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id = tmgs.brand_id
         left join dkic_b.t_psi_inventory tpi on tpi.inv_id = tpii.inv_id

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

@@ -41,6 +41,17 @@ public class InboundItemResponse  {
     private String intoId;
 
     /**
+     * 采购订单
+     */
+    @ApiModelProperty(value = "采购订单")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String purId;
+    /**
+     * 采购订单号
+     */
+    @ApiModelProperty(value = "采购订单号")
+    private String purNo;
+    /**
      * 商品规格
      */
     @Excel(name = "商品规格")
@@ -119,6 +130,26 @@ public class InboundItemResponse  {
     @ApiModelProperty(value = "入库中数量")
     private BigDecimal intoingQty;
 
+    /**
+     * 入库明细 对应来源订单明细中的商品数量
+     */
+    @Excel(name = "入库明细 对应来源订单明细中的商品数量")
+    @ApiModelProperty(value = "入库明细 对应来源订单明细中的商品数量")
+    private BigDecimal purItemQty;
+
+    /**
+     * 入库明细 对应来源订单明细中的商品数量
+     */
+    @Excel(name = "入库明细 对应来源订单明细中的入库中数量")
+    @ApiModelProperty(value = "入库明细 对应来源订单明细中的入库中数量")
+    private BigDecimal purItemIntoingQty;
+
+    /**
+     * 入库明细 对应来源订单明细中的商品数量
+     */
+    @Excel(name = "入库明细 对应来源订单明细中的已入库数量")
+    @ApiModelProperty(value = "入库明细 对应来源订单明细中的已入库数量")
+    private BigDecimal purItemIntoQty;
 
     /**
      * 入库中金额