diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
index 334ef32e8..c054fdd74 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
@@ -697,7 +697,7 @@
and powbp.batch_code = powb.batch_code
where pow.workorder_code = #{workorderCode} and pow.del_flag = '0' and powb.del_flag = '0'
and powbp.pallet_num = #{palletNo}
- order by CAST(powbp.pallet_num AS INT)
+ order by CAST(powbp.pallet_num AS INT),powb.batch_code
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskInventoryController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskInventoryController.java
index 252af4e1b..322566ac5 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskInventoryController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskInventoryController.java
@@ -150,10 +150,34 @@ public class QcCheckTaskInventoryController extends BaseController {
public AjaxResult createCCTaskFromOA(@RequestBody OACheckTaskDTO dto) {
logger.info("oa发起库存检验参数"+ JSONObject.toJSONString(dto));
if(StringUtils.isBlank(dto.getFactoryCode())){
- error("[factoryCode is null]");
+ return AjaxResult.error("[factoryCode is null]");
}
if(CollectionUtils.isEmpty(dto.getDetail())){
- error("[detail is null]");
+ return AjaxResult.error("[detail is null]");
+ }
+ if(StringUtils.isBlank(dto.getApplyNo())){
+ return AjaxResult.error("[applyNo is null]");
+ }
+
+ for(QcCheckTaskInventory qcCheckTaskInventory : dto.getDetail()){
+ if(StringUtils.isBlank(qcCheckTaskInventory.getSerialNumber())){
+ return AjaxResult.error("[serialNumber is null]");
+ }
+ if(StringUtils.isBlank(qcCheckTaskInventory.getMaterialCode())){
+ return AjaxResult.error("[materialCode is null]");
+ }
+ if(StringUtils.isBlank(qcCheckTaskInventory.getMaterialName())){
+ return AjaxResult.error("[materialName is null]");
+ }
+ if(StringUtils.isBlank(qcCheckTaskInventory.getIncomeBatchNo())){
+ return AjaxResult.error("[incomeBatchNo is null]");
+ }
+ if(StringUtils.isBlank(qcCheckTaskInventory.getUnit())){
+ return AjaxResult.error("[unit is null]");
+ }
+ if(qcCheckTaskInventory.getQuality() == null){
+ return AjaxResult.error("[quality is null]");
+ }
}
return qcCheckTaskInventoryService.createCCTaskFromOA(dto);
}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/OACheckTaskDTO.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/OACheckTaskDTO.java
index 7056e29bc..788550ed3 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/OACheckTaskDTO.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/OACheckTaskDTO.java
@@ -2,6 +2,7 @@ package com.op.quality.domain;
import com.op.common.core.web.domain.BaseEntity;
+import java.sql.Date;
import java.util.List;
/**
@@ -12,60 +13,81 @@ import java.util.List;
*/
public class OACheckTaskDTO extends BaseEntity {
private static final long serialVersionUID = 1L;
- //申请单号
- private String applNo;
- /**
- * 检测人工号
- */
- private String checkManCode;
- /**
- * 检测人姓名
- */
- private String checkManName;
- /**
- * QC主管工号
- **/
- private String qcMgr;
- /**
- * 质量主管工号
- **/
- private String zlMgr;
-
- private String factoryCode;
-
- private int taskNum;
-
- public int getTaskNum() {
- return taskNum;
- }
-
- public void setTaskNum(int taskNum) {
- this.taskNum = taskNum;
- }
+ private String recordId;
+ private String applyNo;//申请单号
+ private String applicant;//申请人
+ private String applyDepartment;//申请部门
+ private Date applyDate;//申请日期
+ private String storeAddress;//物品存放地点
+ private String type;//复检物品种类
+ private String checkManCode;//检验人员工号
+ private String checkManName;//检验人员姓名
+ private String qcManager;//QC主管工号
+ private String zlManager;//质量主管工号
+ private String treatmentMan;//处理方案人员工号
+ private int taskNum;//子任务数
+ private String status;//检验状态 0未完成 1检验完成
+ private String factoryCode;//工厂编码
+ private String delFlag;//删除标志
//任务明细
private List detail;
- public String getFactoryCode() {
- return factoryCode;
+ //流程表单中有 数据库表没有
+ //其他仓库
+ //方案处理执行人员
+ //附件
+
+ public String getRecordId() {
+ return recordId;
+ }
+ public void setRecordId(String recordId) {
+ this.recordId = recordId;
}
- public void setFactoryCode(String factoryCode) {
- this.factoryCode = factoryCode;
+ public String getApplyNo() {
+ return applyNo;
+ }
+ public void setApplyNo(String applyNo) {
+ this.applyNo = applyNo;
}
- public String getApplNo() {
- return applNo;
+ public String getApplicant() {
+ return applicant;
+ }
+ public void setApplicant(String applicant) {
+ this.applicant = applicant;
}
- public void setApplNo(String applNo) {
- this.applNo = applNo;
+ public String getApplyDepartment() {
+ return applyDepartment;
+ }
+ public void setApplyDepartment(String applyDepartment) {
+ this.applyDepartment = applyDepartment;
+ }
+
+ public Date getApplyDate() {
+ return applyDate;
+ }
+ public void setApplyDate(Date applyDate) {
+ this.applyDate = applyDate;
+ }
+
+ public String getStoreAddress() { return storeAddress; }
+ public void setStoreAddress(String storeAddress) {
+ this.storeAddress = storeAddress;
+ }
+
+ public String getType() {
+ return type;
+ }
+ public void setType(String type) {
+ this.type = type;
}
public String getCheckManCode() {
return checkManCode;
}
-
public void setCheckManCode(String checkManCode) {
this.checkManCode = checkManCode;
}
@@ -73,31 +95,62 @@ public class OACheckTaskDTO extends BaseEntity {
public String getCheckManName() {
return checkManName;
}
-
public void setCheckManName(String checkManName) {
this.checkManName = checkManName;
}
- public String getQcMgr() {
- return qcMgr;
+ public String getQcManager() {
+ return qcManager;
+ }
+ public void setQcManager(String qcManager) {
+ this.qcManager = qcManager;
}
- public void setQcMgr(String qcMgr) {
- this.qcMgr = qcMgr;
+ public String getZlManager() {
+ return zlManager;
+ }
+ public void setZlManager(String zlManager) {
+ this.zlManager = zlManager;
}
- public String getZlMgr() {
- return zlMgr;
+ public String getTreatmentMan() {
+ return treatmentMan;
+ }
+ public void setTreatmentMan(String treatmentMan) {
+ this.treatmentMan = treatmentMan;
}
- public void setZlMgr(String zlMgr) {
- this.zlMgr = zlMgr;
+ public int getTaskNum() {
+ return taskNum;
+ }
+ public void setTaskNum(int taskNum) {
+ this.taskNum = taskNum;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getDelFlag() {
+ return delFlag;
+ }
+ public void setDelFlag(String delFlag) {
+ this.delFlag = delFlag;
+ }
+
+ public String getFactoryCode() {
+ return factoryCode;
+ }
+ public void setFactoryCode(String factoryCode) {
+ this.factoryCode = factoryCode;
}
public List getDetail() {
return detail;
}
-
public void setDetail(List detail) {
this.detail = detail;
}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskInventory.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskInventory.java
index c2c21b301..8668ec6c0 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskInventory.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskInventory.java
@@ -216,6 +216,9 @@ public class QcCheckTaskInventory extends BaseEntity {
private String checkTimeStart;
private String checkTimeEnd;
+ //序号 复检流程单用
+ private String serialNumber;
+
private List defects;
public void setRecordId(String recordId) {
@@ -514,6 +517,14 @@ public class QcCheckTaskInventory extends BaseEntity {
this.defects = defects;
}
+ public String getSerialNumber() {
+ return serialNumber;
+ }
+
+ public void setSerialNumber(String serialNumber) {
+ this.serialNumber = serialNumber;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskInventoryMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskInventoryMapper.java
index 0776965af..97fb80b05 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskInventoryMapper.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskInventoryMapper.java
@@ -2,6 +2,7 @@ package com.op.quality.mapper;
import java.util.List;
+import com.op.quality.domain.OACheckTaskDTO;
import com.op.quality.domain.QcCheckTaskIncome;
import com.op.quality.domain.QcCheckTaskInventory;
import com.op.quality.domain.QcCheckTaskProduce;
@@ -69,4 +70,7 @@ public interface QcCheckTaskInventoryMapper {
List getPutInOrder(QcCheckTaskInventory qcCheckTaskInventory);
List getPutInOrderList(QcCheckTaskInventory qoPutIn);
+
+ //创建 qc_check_oa_task 复检申请记录
+ void insertQcCheckOaTask(OACheckTaskDTO dto);
}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java
index 63657d04a..ed826998f 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java
@@ -387,15 +387,24 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer
@Override
public AjaxResult createCCTaskFromOA(OACheckTaskDTO dto) {
List dtos = dto.getDetail();
- int m=0;
- for(QcCheckTaskInventory ccTask:dtos){
- ccTask.setAttr1(dto.getApplNo());//申请编码
+ int m = 0;
+ for(QcCheckTaskInventory ccTask : dtos){
+ ccTask.setOrderNo(dto.getApplyNo() + ":" + ccTask.getSerialNumber() );//订单号 = 申请单号 +：+序号
+ ccTask.setAttr1(dto.getApplyNo());//申请编码
ccTask.setCheckType("checkTypeCC");//库存检验
ccTask.setFactoryCode(dto.getFactoryCode());
- m += insertQcCheckTaskInventory(ccTask);
+ if(ccTask.getIncomeTime() == null){
+ ccTask.setIncomeTime(DateUtils.getNowDate());//如果生产日期和入库时间
+ }
+ insertQcCheckTaskInventory(ccTask);
+ m++;
}
- //TODO;
- /**qc_check_oa_task**/
+ /**qc_check_oa_task表新增**/
+ dto.setRecordId(IdUtils.fastSimpleUUID());
+ dto.setTaskNum(dtos.size());
+ dto.setCreateTime(DateUtils.getNowDate());//创建时间
+ dto.setCreateBy(dto.getApplicant());//创建人
+ qcCheckTaskInventoryMapper.insertQcCheckOaTask(dto);
logger.info("++++++++++++oa发起仓库检验任务生成" + m + "++++++++++++++");
return success();
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml
index 58372c0cd..4ea2660b1 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml
@@ -362,4 +362,52 @@
)t0
where t0.days >= t0.warehouse_cycle
+
+
+ insert into qc_check_oa_task
+
+ record_id,
+ apply_no,
+ applicant,
+ apply_department,
+ apply_date,
+ store_address,
+ type,
+ check_man_code,
+ check_man_name,
+ qc_manager,
+ zl_manager,
+ treatment_man,
+ task_num,
+ status,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ factory_code,
+ del_flag,
+
+
+ #{recordId},
+ #{applyNo},
+ #{applicant},
+ #{applyDepartment},
+ #{applyDate},
+ #{storeAddress},
+ #{type},
+ #{checkManCode},
+ #{checkManName},
+ #{qcManager},
+ #{zlManager},
+ #{treatmentMan},
+ #{taskNum},
+ '0',
+ #{createBy},
+ #{createTime},
+ #{updateBy},
+ #{updateTime},
+ #{factoryCode},
+ #{delFlag},
+
+