diff --git a/src/main/java/com/xujie/modules/inspection/data/InspectionRequestItemVO.java b/src/main/java/com/xujie/modules/inspection/data/InspectionRequestItemVO.java index 53be1f2..822ae59 100644 --- a/src/main/java/com/xujie/modules/inspection/data/InspectionRequestItemVO.java +++ b/src/main/java/com/xujie/modules/inspection/data/InspectionRequestItemVO.java @@ -112,6 +112,11 @@ public class InspectionRequestItemVO extends QueryPage { */ private String planner; + /** + * 客户(POHeader.c_customer):用于“其他验货”等特殊 customer 的默认数量与免审判定 + */ + private String customer; + /** 内部验货申请页的本人 Planner 查询范围开关 - rqrq */ private Boolean currentPlannerOnly; diff --git a/src/main/java/com/xujie/modules/inspection/entity/InspectionRequestDetailSub.java b/src/main/java/com/xujie/modules/inspection/entity/InspectionRequestDetailSub.java index 6b85180..25eda41 100644 --- a/src/main/java/com/xujie/modules/inspection/entity/InspectionRequestDetailSub.java +++ b/src/main/java/com/xujie/modules/inspection/entity/InspectionRequestDetailSub.java @@ -90,6 +90,12 @@ public class InspectionRequestDetailSub extends QueryPage { @TableField(exist = false) private String isChanged; + /** + * 验货状态(来自父表 srm_inspect_request_detail.status,按 request_no + item_no 关联,非子表物理列) + */ + @TableField(exist = false) + private String status; + @TableField(exist = false) private String item; diff --git a/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java b/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java index 3436ed3..6ec32fb 100644 --- a/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java +++ b/src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java @@ -63,6 +63,9 @@ import java.util.stream.Collectors; @Service public class InspectionRequestServiceImpl extends ServiceImpl implements InspectionRequestService { + /** “其他验货”客户:该 customer 的新增验货申请默认数量为1且保存后免审直接已下达 - rqrq */ + private static final String OTHER_INSPECT_CUSTOMER = "其他验货"; + @Autowired private InspectionRequestDetailMapper poDetailMapper; @@ -273,9 +276,29 @@ public class InspectionRequestServiceImpl extends ServiceImpl() + .select(POHeader::getCustomer) + .eq(POHeader::getSite, site) + .eq(POHeader::getOrderNo, firstOrderNo) + ); + skipAudit = customerHeader != null + && OTHER_INSPECT_CUSTOMER.equals(customerHeader.getCustomer()); + } + + if (skipAudit) { + header.setStatus("已下达"); + header.setStatusDb("Audited"); + } else { + // 默认状态:草稿 + header.setStatus("草稿"); + header.setStatusDb("Draft"); + } header.setCreateBy(user.getUsername()); header.setCreateDate(new Date()); @@ -399,9 +422,15 @@ public class InspectionRequestServiceImpl extends ServiceImpl AND d.site = #{query.site} diff --git a/src/main/resources/mapper/inspection/InspectionRequestHeaderMapper.xml b/src/main/resources/mapper/inspection/InspectionRequestHeaderMapper.xml index 139e652..1b054eb 100644 --- a/src/main/resources/mapper/inspection/InspectionRequestHeaderMapper.xml +++ b/src/main/resources/mapper/inspection/InspectionRequestHeaderMapper.xml @@ -102,7 +102,8 @@ poh.ship_via AS shipMethod, poh.supplier_no, ss.supplier_name, - ISNULL(dbo.plm_get_user_display(poh.site, poh.c_planner), poh.c_planner) AS planner + ISNULL(dbo.plm_get_user_display(poh.site, poh.c_planner), poh.c_planner) AS planner, + poh.c_customer AS customer FROM PODetail pod INNER JOIN POHeader poh ON poh.order_no = pod.order_no @@ -193,7 +194,8 @@ poh.ship_via AS shipMethod, poh.supplier_no, ss.supplier_name, - ISNULL(dbo.plm_get_user_display(poh.site, poh.c_planner), poh.c_planner) AS planner + ISNULL(dbo.plm_get_user_display(poh.site, poh.c_planner), poh.c_planner) AS planner, + poh.c_customer AS customer FROM PODetail pod INNER JOIN POHeader poh ON poh.order_no = pod.order_no @@ -291,7 +293,8 @@ poh.ship_via AS shipMethod, poh.supplier_no AS supplierNo, ss.supplier_name AS supplierName, - ISNULL(dbo.plm_get_user_display(poh.site, poh.c_planner), poh.c_planner) AS planner + ISNULL(dbo.plm_get_user_display(poh.site, poh.c_planner), poh.c_planner) AS planner, + poh.c_customer AS customer FROM PODetail pod INNER JOIN POHeader poh ON poh.order_no = pod.order_no