diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java index e3885661e..55f426fa6 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java @@ -1028,7 +1028,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // packNo=emisTmsPackDtl.getPackNo(); // 所有运单做拆包操作 - List packDtlList=emisTmsPackDtlMapper.selectPackDtlListByPackNo(packNo); + List packDtlList=emisTmsPackDtlMapper.selectPackDtlListByPackNo(scanBillCode); if(!CollectionUtil.isEmpty(packDtlList)){ for (EmisTmsPackDtl emisTmsPackDtl:packDtlList) { diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml index 9cd14234b..ee77ad05d 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml @@ -123,6 +123,10 @@ and bl_center_confirmed='2' + + and bl_center_confirmed='0' + + and ( apply_site_code in (