feat(qms): 新增检验单号字段并完善相关流程支持
- 在QmsIncomingInspectionTask实体及对应Mapper中添加checkNo字段 - 在IncomingInspectionTaskControllerService中设置并保存检验单号 - 在InventoryInspectionTaskCallbackService中传递检验单号信息 - 在ExternalIncomingInspectionApplyQO及ExternalInventoryInspectionApplyQO中新增检验单号校验 - 修改回调参数类WmsInventoryInspectionTaskCallbackQO，增加检验单号字段与检测数量替代送检数量 - 在DepartmentServiceImpl中完善新增和复制部门时的负责人ID与姓名设置
This commit is contained in:
曹鹏飞
parent
ba571b994c
commit
12d0e0ca71
|
|
@ -187,6 +187,7 @@ public class IncomingInspectionTaskControllerService {
|
|||
|
||||
// 7. 构建并保存来料检测任务
|
||||
QmsIncomingInspectionTask task = new QmsIncomingInspectionTask()
|
||||
.setCheckNo(request.getCheckNo())
|
||||
.setTaskNo(taskNo)
|
||||
.setMaterialId(material.getId())
|
||||
.setInspectionStandardId(standard.getId())
|
||||
|
|
@ -311,6 +312,7 @@ public class IncomingInspectionTaskControllerService {
|
|||
|
||||
// 7. 构建并保存库存检测任务（存入来料检测任务表，dataType=1）
|
||||
QmsIncomingInspectionTask task = new QmsIncomingInspectionTask()
|
||||
.setCheckNo(request.getCheckNo())
|
||||
.setTaskNo(taskNo)
|
||||
.setMaterialId(material.getId())
|
||||
.setInspectionStandardId(standard.getId())
|
||||
|
|
|
|||
|
|
@ -104,12 +104,14 @@ public class WmsIncomingInspectionTaskCallbackService {
|
|||
private void inventory(QmsIncomingInspectionTaskVO taskVO, Short processingResult) {
|
||||
WmsInventoryInspectionTaskCallbackQO qo = new WmsInventoryInspectionTaskCallbackQO()
|
||||
.setTaskNo(taskVO.getTaskNo())
|
||||
.setCheckNo(taskVO.getCheckNo())
|
||||
.setCheckNo(taskVO.getCheckNo())
|
||||
.setMaterialNo(taskVO.getMaterialNo())
|
||||
.setFactory(taskVO.getFactory())
|
||||
.setWarehouse(taskVO.getWarehouse())
|
||||
.setStorageLocation(taskVO.getStorageLocation())
|
||||
.setStorageDays(taskVO.getStorageDays())
|
||||
.setInspectionQty(taskVO.getInspectionQty())
|
||||
.setDetectionQty(taskVO.getDetectionQty())
|
||||
.setQualifiedQty(taskVO.getQualifiedQty())
|
||||
.setUnqualifiedQty(taskVO.getUnqualifiedQty())
|
||||
.setInspectionResult(taskVO.getInspectionResult())
|
||||
|
|
|
|||
|
|
@ -11,6 +11,12 @@ import lombok.Data;
|
|||
@Data
|
||||
public class ExternalIncomingInspectionApplyQO {
|
||||
|
||||
/**
|
||||
* 检验单号，第三方唯一编号
|
||||
*/
|
||||
@NotBlank(message = "检验单号不能为空")
|
||||
private String checkNo;
|
||||
|
||||
/**
|
||||
* 物料编号（必填）
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -11,6 +11,12 @@ import lombok.Data;
|
|||
@Data
|
||||
public class ExternalInventoryInspectionApplyQO {
|
||||
|
||||
/**
|
||||
* 检验单号，第三方唯一编号
|
||||
*/
|
||||
@NotBlank(message = "检验单号不能为空")
|
||||
private String checkNo;
|
||||
|
||||
/**
|
||||
* 物料编号（必填）
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.nflg.wms.common.pojo.qo;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
|
|
@ -14,6 +15,11 @@ public class WmsInventoryInspectionTaskCallbackQO {
|
|||
*/
|
||||
private String taskNo;
|
||||
|
||||
/**
|
||||
* 检验单号，第三方唯一编号
|
||||
*/
|
||||
private String checkNo;
|
||||
|
||||
/**
|
||||
* 物料编号
|
||||
*/
|
||||
|
|
@ -40,9 +46,9 @@ public class WmsInventoryInspectionTaskCallbackQO {
|
|||
private Integer storageDays;
|
||||
|
||||
/**
|
||||
* 送检数量
|
||||
* 检测数量
|
||||
*/
|
||||
private Integer inspectionQty;
|
||||
private Integer detectionQty;
|
||||
|
||||
/**
|
||||
* 合格数量
|
||||
|
|
|
|||
|
|
@ -17,6 +17,11 @@ public class QmsIncomingInspectionTaskVO {
|
|||
*/
|
||||
private String taskNo;
|
||||
|
||||
/**
|
||||
* 检验单号，第三方唯一编号
|
||||
*/
|
||||
private String checkNo;
|
||||
|
||||
/**
|
||||
* 物料id
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -37,6 +37,11 @@ public class QmsIncomingInspectionTask implements Serializable {
|
|||
*/
|
||||
private String taskNo;
|
||||
|
||||
/**
|
||||
* 检验单号，第三方唯一编号
|
||||
*/
|
||||
private String checkNo;
|
||||
|
||||
/**
|
||||
* 物料id，关联质检物料表
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -50,7 +50,9 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
|
|||
.setParentId(request.getParentId())
|
||||
.setEnable(request.getEnable())
|
||||
.setCreateBy(UserUtil.getUserName())
|
||||
.setCreateTime(LocalDateTime.now());
|
||||
.setCreateTime(LocalDateTime.now())
|
||||
.setHeadUserId(request.getHeadUserId())
|
||||
.setHeadUserName(request.getHeadUserName());
|
||||
save(department);
|
||||
auditLogService.addInsert(Department.class, department, UserUtil.getUserName());
|
||||
}
|
||||
|
|
@ -77,7 +79,9 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
|
|||
.setEnable(request.getEnable())
|
||||
.setCreateBy(dept1.getCreateBy())
|
||||
.setCreateTime(dept1.getCreateTime())
|
||||
.setSourceId(request.getNo());
|
||||
.setSourceId(request.getNo())
|
||||
.setHeadUserId(request.getHeadUserId())
|
||||
.setHeadUserName(request.getHeadUserName());
|
||||
|
||||
|
||||
//Department dept2 = BeanUtil.copy(dept1, Department.class);
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
SELECT
|
||||
t.id,
|
||||
t.task_no,
|
||||
t.check_no,
|
||||
t.material_id,
|
||||
m.material_no,
|
||||
m.material_desc,
|
||||
|
|
@ -108,6 +109,7 @@
|
|||
SELECT
|
||||
t.id,
|
||||
t.task_no,
|
||||
t.check_no,
|
||||
t.material_id,
|
||||
m.material_no,
|
||||
m.material_desc,
|
||||
|
|
@ -180,6 +182,7 @@
|
|||
<select id="getDetail" resultType="com.nflg.wms.common.pojo.vo.QmsIncomingInspectionTaskVO">
|
||||
SELECT t.id,
|
||||
t.task_no,
|
||||
t.check_no,
|
||||
t.material_id,
|
||||
m.material_no,
|
||||
m.material_desc,
|
||||
|
|
|
|||
Loading…
Reference in New Issue