diff --git a/src/main/java/com/gaotao/modules/api/service/impl/IfsApiServiceImpl.java b/src/main/java/com/gaotao/modules/api/service/impl/IfsApiServiceImpl.java index dbd110d4..2bbeba13 100644 --- a/src/main/java/com/gaotao/modules/api/service/impl/IfsApiServiceImpl.java +++ b/src/main/java/com/gaotao/modules/api/service/impl/IfsApiServiceImpl.java @@ -216,6 +216,8 @@ public class IfsApiServiceImpl implements IfsApiService { try { BigDecimal sp = inData.getSamplePercent() != null ? new BigDecimal(inData.getSamplePercent()) : BigDecimal.ZERO; BigDecimal qtyToInspect; + // 只有 ARRINV 在到货点检验,检验数量直接取抽样数量。 + // ARRQA 与 QAINV 一样在质检库检验,按抽样比例计算。 if ("ARRINV".equals(inData.getReceiveCaseDB())) { qtyToInspect = new BigDecimal(inData.getSampleQty()); } else { diff --git a/src/main/java/com/gaotao/modules/po/service/impl/PoServiceImpl.java b/src/main/java/com/gaotao/modules/po/service/impl/PoServiceImpl.java index a1227992..f5c79004 100644 --- a/src/main/java/com/gaotao/modules/po/service/impl/PoServiceImpl.java +++ b/src/main/java/com/gaotao/modules/po/service/impl/PoServiceImpl.java @@ -158,7 +158,7 @@ public class PoServiceImpl extends ServiceImpl implemen line.put("supplierNo", po.get("supplierNo")); line.put("supplierName", po.get("supplierName")); line.put("buyerCode", po.get("buyerCode")); - // 根据poLine的receiveCaseDB判断是否需要检验 + // 仅 INVDIR 直接入库不检验;QAINV、ARRINV、ARRQA 都要检验 String receiveCaseDB = line.get("receiveCaseDB") != null ? line.get("receiveCaseDB").toString() : ""; if ("INVDIR".equals(receiveCaseDB)) { line.put("needCheck", "N"); diff --git a/src/main/java/com/gaotao/modules/warehouse/service/impl/LocationServiceImpl.java b/src/main/java/com/gaotao/modules/warehouse/service/impl/LocationServiceImpl.java index 81ca6522..788ad880 100644 --- a/src/main/java/com/gaotao/modules/warehouse/service/impl/LocationServiceImpl.java +++ b/src/main/java/com/gaotao/modules/warehouse/service/impl/LocationServiceImpl.java @@ -71,10 +71,9 @@ public class LocationServiceImpl extends ServiceImpl i String expectedType = ""; switch (receiveCaseDB) { + // ARRINV、ARRQA、QAINV 都要进质检库位;ARRQA 是到货后转质检,库位类型与另外两种一致 case "ARRINV": - expectedType = "QA"; - isValid = "QA".equals(locationType); - break; + case "ARRQA": case "QAINV": expectedType = "QA"; isValid = "QA".equals(locationType);