diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml index 472e0b0e..820c95de 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml @@ -124,11 +124,11 @@ 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, diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java index 57c9d47b..fc8d37cb 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java +++ b/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 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());