sql修改

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

@@ -181,6 +181,7 @@
         <result column="sub_unit_code" property="subUnitCode"/>
         <result column="sub_unit_name" property="subUnitName"/>
         <result column="pack_box" property="packBox"/>
+        <result column="sItemAmt" property="sItemAmt"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -608,7 +609,8 @@
         tppi.return_amt AS "sPurItemReturnAmt",
         sys.f_remove_zero ( tpi.usable_qty ) AS "usableQty",
         tpi.non_std_code AS "non_std_code",
-        ( SELECT ul.decimal_places FROM dkic_b.t_mst_unit ul WHERE tpii.unit_id = ul.unit_id ) AS "decimalPlaces"
+        ( SELECT ul.decimal_places FROM dkic_b.t_mst_unit ul WHERE tpii.unit_id = ul.unit_id ) AS "decimalPlaces",
+        tppi.item_amt AS "sItemAmt"
         FROM
         dkic_b.t_psi_inbound_item tpii
         LEFT JOIN dkic_b.t_mst_goods_sku tmgs ON tmgs.sku_id = tpii.sku_id

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

@@ -209,6 +209,7 @@
         <result column="can_return_qty" property="canReturnQty"/>
         <result column="price_into" property="priceInto"/>
         <result column="sku_spec" property="skuSpec"/>
+        <result column="decimalPlaces" property="decimalPlaces"/>
 
     </resultMap>
 
@@ -668,6 +669,7 @@
         sys.f_remove_zero(tpii.into_qty)  AS list_into_qty,
         tpii.into_amt AS list_into_amt,
         sys.f_remove_zero(tpii.return_qty) AS list_return_qty,
+        ( SELECT ul.decimal_places FROM dkic_b.t_mst_unit ul WHERE tpii.unit_id = ul.unit_id ) AS "list_decimalPlaces",
         tpii.return_amt AS list_return_amt,
         tpii.remarks AS list_remarks,
         tpii.inv_id AS list_inv_id,
@@ -1405,12 +1407,9 @@
         ,case when tpi.receivable_id is null then false
         when tmai.amt_handle = 0 then false
         else true end as "paymentFlag"
-        ,tpp.sum_amount AS "purSumAmount"
-        ,tpp.return_amt AS "purReturnAmt"
         ,sys.f_get_name_i18n(tdktype.kind_name_i18n,  #{i18n}) AS  "intoStatusName"
         FROM dkic_b.t_psi_inbound tpi
         Left join dkic_b.t_mst_org tmo on tmo.org_id = tpi.org_id
-        Left join dkic_b.t_psi_purchase tpp on tpp.pur_id = tpi.from_id
         Left join dkic_b.t_mst_supplier tmp on tmp.sup_id = tpi.sup_id
         Left join dkic_b.t_mst_staff tms on tms.staff_id = tpi.staff_id
         Left join dkic_b.t_mst_staff tms1 on tms1.staff_id = tpi.make_staff

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

@@ -529,6 +529,8 @@ public class InboundItemResponse  {
 
     private BigDecimal canReturnQty;
 
+    private BigDecimal sItemAmt;
+
     @ApiModelProperty(value = "其他入库编辑传给库存标识,true：库存为0时改为无效，false:库位为0时不用动")
     private  Boolean  updateOtherIntoInvFlag;
 

src/main/java/com/dk/mdm/model/vo/ivt/InboundVO.java

@@ -263,6 +263,9 @@ public class InboundVO {
     @JsonProperty(value = "sPurId")
     private String sPurId;
 
+    @ApiModelProperty(value = "供应商地址")
+    private String returnAddress;
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseReturnService.java

@@ -15,10 +15,12 @@ import com.dk.mdm.infrastructure.convert.ivt.InboundConvert;
 import com.dk.mdm.infrastructure.convert.ivt.InboundItemConvert;
 import com.dk.mdm.mapper.common.CommonMapper;
 import com.dk.mdm.mapper.ivt.*;
+import com.dk.mdm.mapper.mst.SupplierMapper;
 import com.dk.mdm.model.pojo.ivt.Inbound;
 import com.dk.mdm.model.pojo.ivt.InboundItem;
 import com.dk.mdm.model.pojo.ivt.IntoReturn;
 import com.dk.mdm.model.pojo.ivt.IntoReturnItem;
+import com.dk.mdm.model.pojo.mst.Supplier;
 import com.dk.mdm.model.pojo.pur.Purchase;
 import com.dk.mdm.model.pojo.pur.PurchaseItem;
 import com.dk.mdm.model.query.ivt.InboundItemQuery;
@@ -82,6 +84,8 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
     @Autowired
     private AccountService accountService;
 
+    @Autowired
+    private SupplierMapper supplierMapper;
 
     /**
      * @desc : 条件查询
@@ -118,6 +122,17 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
      */
     @Transactional(rollbackFor = {Exception.class})
     public ResponseResultVO<?> purchaseReturnInboundInsert(InboundVO inboundVO) {
+
+        //TODO 更新供应商信息(后续可能会 在入库表中增加地址字段) 2024/7/17 于继渤
+        if (inboundVO.getSupId() != null && inboundVO.getReturnAddress() !=null){
+            Supplier supplier = new Supplier();
+            supplier.setSupId(inboundVO.getSupId());
+            supplier.setReturnAddress(inboundVO.getReturnAddress());
+            supplierMapper.update(supplier,
+                    new UpdateWrapper<Supplier>().lambda()
+                            .eq(Supplier::getSupId, UUID.fromString(supplier.getSupId()))
+            );
+        }
         //region  查询当前公司的系统参数  自动办理信息  并赋值
         Map<String, Object> map = new HashMap<>();
         map.put("cpId", inboundVO.getCpId());