Browse Source

其他验货任务

master
qiankanghui 1 week ago
parent
commit
b69fc4bb70
  1. 5
      src/main/java/com/xujie/modules/inspection/data/InspectionRequestItemVO.java
  2. 6
      src/main/java/com/xujie/modules/inspection/entity/InspectionRequestDetailSub.java
  3. 41
      src/main/java/com/xujie/modules/inspection/service/impl/InspectionRequestServiceImpl.java
  4. 7
      src/main/resources/mapper/inspection/InspectionRequestDetailSubMapper.xml
  5. 9
      src/main/resources/mapper/inspection/InspectionRequestHeaderMapper.xml

5
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;

6
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;

41
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<InspectionRequestHeaderMapper, InspectionRequestHeader> 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<InspectionRequestH
header.setInspectPhone(vo.getInspectPhone());
header.setRemark(vo.getRemark());
// 默认状态:草稿
header.setStatus("草稿");
header.setStatusDb("Draft");
// 判定“其他验货”客户:命中则免审,保存直接落已下达(等价系统自动执行提交+审核);否则草稿 - rqrq
String firstOrderNo = (vo.getItems() != null && !vo.getItems().isEmpty())
? vo.getItems().get(0).getOrderNo() : null;
boolean skipAudit = false;
if (StringUtils.hasText(firstOrderNo)) {
POHeader customerHeader = poheaderMapper.selectOne(
new LambdaQueryWrapper<POHeader>()
.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<InspectionRequestH
detail.setQty(totalQty);
// 默认状态:草稿
detail.setStatus("草稿");
detail.setStatusDb("Draft");
// 与头表保持一致:其他验货免审直接已下达,否则草稿 - rqrq
if (skipAudit) {
detail.setStatus("已下达");
detail.setStatusDb("Audited");
} else {
// 默认状态:草稿
detail.setStatus("草稿");
detail.setStatusDb("Draft");
}
inspectionRequestDetailMapper.insert(detail);
requestItemNo++;

7
src/main/resources/mapper/inspection/InspectionRequestDetailSubMapper.xml

@ -45,7 +45,8 @@
OR CONVERT(varchar(10), d.crd, 23) != CONVERT(varchar(10), ISNULL(pod.c_crd, pod.want_receive_date), 23)
THEN 'Y'
ELSE 'N'
END AS is_changed
END AS is_changed,
detail.status AS status
FROM srm_inspect_request_detail_sub d
LEFT JOIN part p
ON d.part_no = p.part_no
@ -57,6 +58,10 @@
LEFT JOIN POHeader poh
ON d.site = poh.site
AND d.po_no = poh.order_no
LEFT JOIN srm_inspect_request_detail detail
ON detail.site = d.site
AND detail.request_no = d.request_no
AND detail.item_no = d.item_no
<where>
<if test="query.site != null and query.site != ''">
AND d.site = #{query.site}

9
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

Loading…
Cancel
Save