Compare commits
2 Commits
66f732bf66
...
260e533cc0
| Author | SHA1 | Date |
|---|---|---|
|
|
260e533cc0 | |
|
|
a43523da36 |
|
|
@ -187,7 +187,7 @@ public class IncomingInspectionTaskControllerService {
|
||||||
|
|
||||||
// 7. 构建并保存来料检测任务
|
// 7. 构建并保存来料检测任务
|
||||||
QmsIncomingInspectionTask task = new QmsIncomingInspectionTask()
|
QmsIncomingInspectionTask task = new QmsIncomingInspectionTask()
|
||||||
.setCheckNo(request.getCheckNo())
|
.setRequestNo(request.getRequestNo())
|
||||||
.setTaskNo(taskNo)
|
.setTaskNo(taskNo)
|
||||||
.setMaterialId(material.getId())
|
.setMaterialId(material.getId())
|
||||||
.setInspectionStandardId(standard.getId())
|
.setInspectionStandardId(standard.getId())
|
||||||
|
|
@ -312,7 +312,7 @@ public class IncomingInspectionTaskControllerService {
|
||||||
|
|
||||||
// 7. 构建并保存库存检测任务(存入来料检测任务表,dataType=1)
|
// 7. 构建并保存库存检测任务(存入来料检测任务表,dataType=1)
|
||||||
QmsIncomingInspectionTask task = new QmsIncomingInspectionTask()
|
QmsIncomingInspectionTask task = new QmsIncomingInspectionTask()
|
||||||
.setCheckNo(request.getCheckNo())
|
.setRequestNo(request.getRequestNo())
|
||||||
.setTaskNo(taskNo)
|
.setTaskNo(taskNo)
|
||||||
.setMaterialId(material.getId())
|
.setMaterialId(material.getId())
|
||||||
.setInspectionStandardId(standard.getId())
|
.setInspectionStandardId(standard.getId())
|
||||||
|
|
|
||||||
|
|
@ -113,13 +113,14 @@ public class QmsQcMaterialControllerService {
|
||||||
// 构建当前节点完整路径:parentTree.id(若 parentTree 为空则直接取 id)
|
// 构建当前节点完整路径:parentTree.id(若 parentTree 为空则直接取 id)
|
||||||
String fullPath = StrUtil.isBlank(category.getParentTree())
|
String fullPath = StrUtil.isBlank(category.getParentTree())
|
||||||
? String.valueOf(category.getId())
|
? String.valueOf(category.getId())
|
||||||
: category.getParentTree() + "." + category.getId();
|
: category.getParentTree();
|
||||||
|
|
||||||
// 一次查询:自身 + 直接子节点(parentTree=fullPath)+ 孙级及更深(parentTree LIKE 'fullPath.%')
|
// 一次查询:自身 + 直接子节点(parentTree=fullPath)+ 孙级及更深(parentTree LIKE 'fullPath.%')
|
||||||
|
// parent_tree 为 ltree 类型,需显式转为 text 才能与 varchar 比较
|
||||||
return qcMaterialCategoryService.lambdaQuery()
|
return qcMaterialCategoryService.lambdaQuery()
|
||||||
.eq(QmsQcMaterialCategory::getCategoryCode, categoryCode)
|
.eq(QmsQcMaterialCategory::getCategoryCode, categoryCode)
|
||||||
.or().eq(QmsQcMaterialCategory::getParentTree, fullPath)
|
.or().apply("parent_tree::text = {0}", fullPath)
|
||||||
.or().likeRight(QmsQcMaterialCategory::getParentTree, fullPath + ".")
|
.or().apply("parent_tree::text LIKE {0}", fullPath + ".%")
|
||||||
.list()
|
.list()
|
||||||
.stream()
|
.stream()
|
||||||
.map(QmsQcMaterialCategory::getCategoryCode)
|
.map(QmsQcMaterialCategory::getCategoryCode)
|
||||||
|
|
|
||||||
|
|
@ -104,8 +104,7 @@ public class WmsIncomingInspectionTaskCallbackService {
|
||||||
private void inventory(QmsIncomingInspectionTaskVO taskVO, Short processingResult) {
|
private void inventory(QmsIncomingInspectionTaskVO taskVO, Short processingResult) {
|
||||||
WmsInventoryInspectionTaskCallbackQO qo = new WmsInventoryInspectionTaskCallbackQO()
|
WmsInventoryInspectionTaskCallbackQO qo = new WmsInventoryInspectionTaskCallbackQO()
|
||||||
.setTaskNo(taskVO.getTaskNo())
|
.setTaskNo(taskVO.getTaskNo())
|
||||||
.setCheckNo(taskVO.getCheckNo())
|
.setRequestNo(taskVO.getRequestNo())
|
||||||
.setCheckNo(taskVO.getCheckNo())
|
|
||||||
.setMaterialNo(taskVO.getMaterialNo())
|
.setMaterialNo(taskVO.getMaterialNo())
|
||||||
.setFactory(taskVO.getFactory())
|
.setFactory(taskVO.getFactory())
|
||||||
.setWarehouse(taskVO.getWarehouse())
|
.setWarehouse(taskVO.getWarehouse())
|
||||||
|
|
|
||||||
|
|
@ -12,10 +12,10 @@ import lombok.Data;
|
||||||
public class ExternalIncomingInspectionApplyQO {
|
public class ExternalIncomingInspectionApplyQO {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 检验单号,第三方唯一编号
|
* 请求单号,第三方唯一编号
|
||||||
*/
|
*/
|
||||||
@NotBlank(message = "检验单号不能为空")
|
@NotBlank(message = "请求单号不能为空")
|
||||||
private String checkNo;
|
private String requestNo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 物料编号(必填)
|
* 物料编号(必填)
|
||||||
|
|
|
||||||
|
|
@ -12,10 +12,10 @@ import lombok.Data;
|
||||||
public class ExternalInventoryInspectionApplyQO {
|
public class ExternalInventoryInspectionApplyQO {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 检验单号,第三方唯一编号
|
* 请求单号,第三方唯一编号
|
||||||
*/
|
*/
|
||||||
@NotBlank(message = "检验单号不能为空")
|
@NotBlank(message = "请求单号不能为空")
|
||||||
private String checkNo;
|
private String requestNo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 物料编号(必填)
|
* 物料编号(必填)
|
||||||
|
|
|
||||||
|
|
@ -16,9 +16,9 @@ public class WmsInventoryInspectionTaskCallbackQO {
|
||||||
private String taskNo;
|
private String taskNo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 检验单号,第三方唯一编号
|
* 请求单号,第三方唯一编号
|
||||||
*/
|
*/
|
||||||
private String checkNo;
|
private String requestNo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 物料编号
|
* 物料编号
|
||||||
|
|
|
||||||
|
|
@ -18,9 +18,9 @@ public class QmsIncomingInspectionTaskVO {
|
||||||
private String taskNo;
|
private String taskNo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 检验单号,第三方唯一编号
|
* 请求单号,第三方唯一编号
|
||||||
*/
|
*/
|
||||||
private String checkNo;
|
private String requestNo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 物料id
|
* 物料id
|
||||||
|
|
|
||||||
|
|
@ -38,9 +38,9 @@ public class QmsIncomingInspectionTask implements Serializable {
|
||||||
private String taskNo;
|
private String taskNo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 检验单号,第三方唯一编号
|
* 请求单号,第三方唯一编号
|
||||||
*/
|
*/
|
||||||
private String checkNo;
|
private String requestNo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 物料id,关联质检物料表
|
* 物料id,关联质检物料表
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue