运管接口修改

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml

@@ -124,11 +124,11 @@
 
     <select id="saleOutBoundByYunGuan" resultType="jnpf.model.yunguan.YunguanSaleOutBoundModel">
         SELECT
-            a.id AS OUT_ID,
+            aa.id AS OUT_ID,
             e.f_en_code AS COMP_ID,
             f.f_en_code AS DEPT_ID,
             a.document_no AS PROD_ZL,
-            aa.order_line as CK_ORDER,
+            concat(a.document_no,'-',LPAD(aa.order_line,3,0)) as CK_ORDER,
             IF(a.warehousing_outbound_type = 1,c.code,m.code) as SAL_ORDER,
             IF(a.warehousing_outbound_type = 1,d.code,q.code) as CUS_ID,
             IF(a.warehousing_outbound_type = 1,d.name,q.name) as CUS_NAME,

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml

@@ -358,7 +358,7 @@
 
     <select id="purchaseInBoundByYunGuan" resultType="jnpf.model.yunguan.YunguanPurchaseInBoundModel">
         SELECT
-            a.id AS ID,
+            aa.id AS ID,
             e.f_en_code AS COMP_CD,
             IF(a.warehousing_storage_type = '1',h.kucun_org_code,q.kucun_org_code) AS INV_ORG_CD,
             IF(a.warehousing_storage_type = '1',h.kucun_org_name,q.kucun_org_name) AS INV_ORG_NM,

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java

@@ -1092,9 +1092,11 @@ public class YunguanInterfaceController {
                     warehousingOutboundQueryWrapper.lambda().eq(WarehousingOutboundEntity::getDocumentNo,yunguanSaleOutBoundModel.getPROD_ZL());
                     WarehousingOutboundEntity warehousingOutboundEntity = warehousingOutboundService.getOne(warehousingOutboundQueryWrapper);
                     if (ObjectUtil.isNotEmpty(warehousingOutboundEntity)){
+                        int index = yunguanSaleOutBoundModel.getCK_ORDER().lastIndexOf("-");
+                        String lineNo =yunguanSaleOutBoundModel.getCK_ORDER().substring(index + 1).replaceFirst("^0*","");
                         QueryWrapper<WarehousingOutboundProductEntity> warehousingOutboundProductQueryWrapper = new QueryWrapper<>();
                         warehousingOutboundProductQueryWrapper.lambda().eq(WarehousingOutboundProductEntity::getWarehousingOutboundId,warehousingOutboundEntity.getId());
-                        warehousingOutboundProductQueryWrapper.lambda().eq(WarehousingOutboundProductEntity::getOrderLine,yunguanSaleOutBoundModel.getCK_ORDER());
+                        warehousingOutboundProductQueryWrapper.lambda().eq(WarehousingOutboundProductEntity::getOrderLine,lineNo);
                         WarehousingOutboundProductEntity warehousingOutboundProductEntity = warehousingOutboundProductService.getOne(warehousingOutboundProductQueryWrapper);
                         if (ObjectUtil.isNotEmpty(warehousingOutboundProductEntity)){
                             warehousingOutboundProductEntity.setYunguanMark(yunguanSaleOutBoundModel.getREAD_FLAG());