diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java index b8914435..03f74dda 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java @@ -90,5 +90,5 @@ public interface SupplierdeliverRecordMainService { * @param ppoLine 订单行 * @return 供应商发货记录子 */ - public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordMainDO(String pasnNumber, String pitemCode, String ppoNumber, String ppoLine); + public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordMainDO(String psupplierCode,String pnumber, String pitemCode, String ppoNumber, String ppoLine); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java index 89115b8b..18286d50 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java @@ -93,9 +93,10 @@ public class SupplierdeliverRecordMainServiceImpl implements SupplierdeliverReco return supplierdeliverRecordMainMapper.selectList(exportReqVO); } @Override - public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordMainDO(String pasnNumber, String pitemCode, String ppoNumber, String ppoLine) { + public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordMainDO(String psupplierCode,String pnumber, String pitemCode, String ppoNumber, String ppoLine) { QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("asn_number",pasnNumber); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("supplier_code",psupplierCode); SupplierdeliverRecordMainDO supplierdeliverRecordMainDO = supplierdeliverRecordMainMapper.selectOne(queryWrapper); if(supplierdeliverRecordMainDO != null && "TRUE".equals(supplierdeliverRecordMainDO.getAvailable())){ QueryWrapper queryWrapper1 = new QueryWrapper(); @@ -103,6 +104,7 @@ public class SupplierdeliverRecordMainServiceImpl implements SupplierdeliverReco queryWrapper1.eq("item_code",pitemCode); queryWrapper1.eq("po_number",ppoNumber); queryWrapper1.eq("po_line",ppoLine); + queryWrapper1.eq("number",pnumber); SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = supplierdeliverRecordDetailMapper.selectOne(queryWrapper1); if(supplierdeliverRecordDetailDO != null){ return supplierdeliverRecordDetailDO; @@ -111,8 +113,7 @@ public class SupplierdeliverRecordMainServiceImpl implements SupplierdeliverReco } }else { - throw new UtilException( "发货订单无效" + pasnNumber + "无效"); - + throw new UtilException( "发货订单无效" + pnumber + "无效"); } } }