diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java
index 701246a8..7259f8bf 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteOpenService.java
@@ -4,10 +4,7 @@ import com.op.common.core.constant.ServiceNameConstants;
import com.op.common.core.web.domain.AjaxResult;
import com.op.system.api.factory.RemoteOpenFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
import java.util.Map;
@@ -24,6 +21,6 @@ public interface RemoteOpenService {
/**获取流程信息**/
- @GetMapping("/openInterface/GetOaNodeInfo")
- public AjaxResult GetOaNodeInfo(@RequestParam("requestId") String requestId);
+ @GetMapping("/openInterface/GetOaNodeInfo/{requestid}")
+ public AjaxResult GetOaNodeInfo(@PathVariable("requestid") String requestId);
}
diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/OAInfo.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/OAInfo.java
new file mode 100644
index 00000000..6d55cab7
--- /dev/null
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/OAInfo.java
@@ -0,0 +1,300 @@
+package com.op.system.api.domain.quality;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.op.common.core.annotation.Excel;
+import com.op.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * oa返回信息
+ *
+ * @author Open Platform
+ * @date 2023-10-31
+ */
+public class OAInfo extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+ //请求id
+ private String REQUESTID;
+ //工作流id
+ private String WORKFLOWID;
+ //操作节点id
+ private String NODEID;
+ //签字类型 0：批准
1：保存
2：提交
3：退回
4：重新打开
5：删除
6：激活
7：转发
9：批注
+ // a：意见征询
b：意见征询回复
e：强制归档
h：转办
i：干预
j：转办反馈
s：督办
t：抄送
+ private String LOGTYPE;
+ //操作日期
+ private String OPERATEDATE;
+ //操作时间
+ private String OPERATETIME;
+ //操作者
+ private String OPERATOR;
+ //意见
+ private String REMARK1;
+ //客户端ip
+ private String CLIENTIP;
+ //操作者类型1：人力资源，2：客户
+ private String OPERATORTYPE;
+ //下一节点id
+ private String DESTNODEID;
+ //接收人
+ private String RECEIVEDPERSONS_1;
+ //显示顺序
+ private String SHOWORDER;
+ //代理人
+ private String AGENTORBYAGENTID;
+ //代理类型
+ private String AGENTTYPE;
+ //日志id
+ private String LOGID;
+ //签字信息
+ private String REMARK;
+ //相关附件
+ private String ANNEXDOCIDS;
+ //日志id
+ private String REQUESTLOGID;
+ //操作者部门
+ private String OPERATORDEPT;
+ //相关文档
+ private String SIGNDOCIDS;
+ //相关流程
+ private String SIGNWORKFLOWIDS;
+ //接收者名称
+ private String RECEIVEDPERSONS;
+ //是否为手机版本
+ private String ISMOBILE;
+ // 手写签批
+ private String HANDWRITTENSIGN;
+ //语音附件
+ private String SPEECHATTACHMENT;
+ //接收人id
+ private String RECEIVEDPERSONIDS;
+ //意见位置
+ private String REMARKLOCATION;
+
+ public String getREQUESTID() {
+ return REQUESTID;
+ }
+
+ public void setREQUESTID(String REQUESTID) {
+ this.REQUESTID = REQUESTID;
+ }
+
+ public String getWORKFLOWID() {
+ return WORKFLOWID;
+ }
+
+ public void setWORKFLOWID(String WORKFLOWID) {
+ this.WORKFLOWID = WORKFLOWID;
+ }
+
+ public String getNODEID() {
+ return NODEID;
+ }
+
+ public void setNODEID(String NODEID) {
+ this.NODEID = NODEID;
+ }
+
+ public String getLOGTYPE() {
+ return LOGTYPE;
+ }
+
+ public void setLOGTYPE(String LOGTYPE) {
+ this.LOGTYPE = LOGTYPE;
+ }
+
+ public String getOPERATEDATE() {
+ return OPERATEDATE;
+ }
+
+ public void setOPERATEDATE(String OPERATEDATE) {
+ this.OPERATEDATE = OPERATEDATE;
+ }
+
+ public String getOPERATETIME() {
+ return OPERATETIME;
+ }
+
+ public void setOPERATETIME(String OPERATETIME) {
+ this.OPERATETIME = OPERATETIME;
+ }
+
+ public String getOPERATOR() {
+ return OPERATOR;
+ }
+
+ public void setOPERATOR(String OPERATOR) {
+ this.OPERATOR = OPERATOR;
+ }
+
+ public String getREMARK1() {
+ return REMARK1;
+ }
+
+ public void setREMARK1(String REMARK1) {
+ this.REMARK1 = REMARK1;
+ }
+
+ public String getCLIENTIP() {
+ return CLIENTIP;
+ }
+
+ public void setCLIENTIP(String CLIENTIP) {
+ this.CLIENTIP = CLIENTIP;
+ }
+
+ public String getOPERATORTYPE() {
+ return OPERATORTYPE;
+ }
+
+ public void setOPERATORTYPE(String OPERATORTYPE) {
+ this.OPERATORTYPE = OPERATORTYPE;
+ }
+
+ public String getDESTNODEID() {
+ return DESTNODEID;
+ }
+
+ public void setDESTNODEID(String DESTNODEID) {
+ this.DESTNODEID = DESTNODEID;
+ }
+
+ public String getRECEIVEDPERSONS_1() {
+ return RECEIVEDPERSONS_1;
+ }
+
+ public void setRECEIVEDPERSONS_1(String RECEIVEDPERSONS_1) {
+ this.RECEIVEDPERSONS_1 = RECEIVEDPERSONS_1;
+ }
+
+ public String getSHOWORDER() {
+ return SHOWORDER;
+ }
+
+ public void setSHOWORDER(String SHOWORDER) {
+ this.SHOWORDER = SHOWORDER;
+ }
+
+ public String getAGENTORBYAGENTID() {
+ return AGENTORBYAGENTID;
+ }
+
+ public void setAGENTORBYAGENTID(String AGENTORBYAGENTID) {
+ this.AGENTORBYAGENTID = AGENTORBYAGENTID;
+ }
+
+ public String getAGENTTYPE() {
+ return AGENTTYPE;
+ }
+
+ public void setAGENTTYPE(String AGENTTYPE) {
+ this.AGENTTYPE = AGENTTYPE;
+ }
+
+ public String getLOGID() {
+ return LOGID;
+ }
+
+ public void setLOGID(String LOGID) {
+ this.LOGID = LOGID;
+ }
+
+ public String getREMARK() {
+ return REMARK;
+ }
+
+ public void setREMARK(String REMARK) {
+ this.REMARK = REMARK;
+ }
+
+ public String getANNEXDOCIDS() {
+ return ANNEXDOCIDS;
+ }
+
+ public void setANNEXDOCIDS(String ANNEXDOCIDS) {
+ this.ANNEXDOCIDS = ANNEXDOCIDS;
+ }
+
+ public String getREQUESTLOGID() {
+ return REQUESTLOGID;
+ }
+
+ public void setREQUESTLOGID(String REQUESTLOGID) {
+ this.REQUESTLOGID = REQUESTLOGID;
+ }
+
+ public String getOPERATORDEPT() {
+ return OPERATORDEPT;
+ }
+
+ public void setOPERATORDEPT(String OPERATORDEPT) {
+ this.OPERATORDEPT = OPERATORDEPT;
+ }
+
+ public String getSIGNDOCIDS() {
+ return SIGNDOCIDS;
+ }
+
+ public void setSIGNDOCIDS(String SIGNDOCIDS) {
+ this.SIGNDOCIDS = SIGNDOCIDS;
+ }
+
+ public String getSIGNWORKFLOWIDS() {
+ return SIGNWORKFLOWIDS;
+ }
+
+ public void setSIGNWORKFLOWIDS(String SIGNWORKFLOWIDS) {
+ this.SIGNWORKFLOWIDS = SIGNWORKFLOWIDS;
+ }
+
+ public String getRECEIVEDPERSONS() {
+ return RECEIVEDPERSONS;
+ }
+
+ public void setRECEIVEDPERSONS(String RECEIVEDPERSONS) {
+ this.RECEIVEDPERSONS = RECEIVEDPERSONS;
+ }
+
+ public String getISMOBILE() {
+ return ISMOBILE;
+ }
+
+ public void setISMOBILE(String ISMOBILE) {
+ this.ISMOBILE = ISMOBILE;
+ }
+
+ public String getHANDWRITTENSIGN() {
+ return HANDWRITTENSIGN;
+ }
+
+ public void setHANDWRITTENSIGN(String HANDWRITTENSIGN) {
+ this.HANDWRITTENSIGN = HANDWRITTENSIGN;
+ }
+
+ public String getSPEECHATTACHMENT() {
+ return SPEECHATTACHMENT;
+ }
+
+ public void setSPEECHATTACHMENT(String SPEECHATTACHMENT) {
+ this.SPEECHATTACHMENT = SPEECHATTACHMENT;
+ }
+
+ public String getRECEIVEDPERSONIDS() {
+ return RECEIVEDPERSONIDS;
+ }
+
+ public void setRECEIVEDPERSONIDS(String RECEIVEDPERSONIDS) {
+ this.RECEIVEDPERSONIDS = RECEIVEDPERSONIDS;
+ }
+
+ public String getREMARKLOCATION() {
+ return REMARKLOCATION;
+ }
+
+ public void setREMARKLOCATION(String REMARKLOCATION) {
+ this.REMARKLOCATION = REMARKLOCATION;
+ }
+}
diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java
index 6eef9a1a..a5b702d5 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteOpenFallbackFactory.java
@@ -7,6 +7,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
@@ -25,7 +26,7 @@ public class RemoteOpenFallbackFactory implements FallbackFactory list = mesReportWorkService.selectMesReportWorkList_S(mesReportWork);
+ for(MesReportWork dto:list){
+ if("1".equals(dto.getUploadStatus())){
+ dto.setUploadStatus("sap报工成功");
+ }else if("2".equals(dto.getUploadStatus())){
+ dto.setUploadStatus("sap报工失败");
+ }else if("0".equals(dto.getUploadStatus())){
+ dto.setUploadStatus("待报工sap");
+ }
+ }
ExcelUtil util = new ExcelUtil(MesReportWork.class);
util.exportExcel(response, list, "报工报表数据");
}
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java
index 95c6a72c..d0cf34fc 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java
@@ -133,15 +133,15 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
@DS("#header.poolName")
public List getReportWorkHzList(MesReportWork mesReportWork) {
List dtos = mesReportWorkMapper.getReportWorkHzList(mesReportWork);
- for(MesReportWork dto:dtos){
- if("1".equals(dto.getUploadStatus())){
- dto.setUploadStatus("sap报工成功");
- }else if("2".equals(dto.getUploadStatus())){
- dto.setUploadStatus("sap报工失败");
- }else if("0".equals(dto.getUploadStatus())){
- dto.setUploadStatus("待报工sap");
- }
- }
+// for(MesReportWork dto:dtos){
+// if("1".equals(dto.getUploadStatus())){
+// dto.setUploadStatus("sap报工成功");
+// }else if("2".equals(dto.getUploadStatus())){
+// dto.setUploadStatus("sap报工失败");
+// }else if("0".equals(dto.getUploadStatus())){
+// dto.setUploadStatus("待报工sap");
+// }
+// }
return dtos;
}
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java
index 3015610c..4aa6c5e5 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesUnitPriceServiceImpl.java
@@ -38,6 +38,7 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService {
* @return unitPrice
*/
@Override
+ @DS("#header.poolName")
public MesUnitPrice selectMesUnitPriceByPicId(String picId) {
return mesUnitPriceMapper.selectMesUnitPriceByPicId(picId);
}
@@ -73,6 +74,7 @@ public class MesUnitPriceServiceImpl implements IMesUnitPriceService {
* @return 结果
*/
@Override
+ @DS("#header.poolName")
public int updateMesUnitPrice(MesUnitPrice mesUnitPrice) {
mesUnitPrice.setUpdateTime(DateUtils.getNowDate());
return mesUnitPriceMapper.updateMesUnitPrice(mesUnitPrice);
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
index fb4dd409..716138c8 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
@@ -493,7 +493,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
shift_code shiftCode,
sum(quantity_feedback) quantityFeedback,
sum(work_time) workTime,
- sum(use_man) useMan,
+ use_man useMan,
upload_status uploadStatus,
upload_time uploadTime,
upload_msg uploadMsg,
@@ -507,7 +507,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and machine_name like concat('%', #{machineName}, '%')
and upload_status = #{uploadStatus}
group by workorder_code, product_code,product_name,machine_code,machine_name,shift_code
- ,upload_status,unit
+ ,upload_status,unit,use_man
,upload_time,upload_msg
) mrw
left join pro_order_workorder pow on mrw.workorderCode = pow.workorder_code
diff --git a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java
index de9fc1df..d86bb25e 100644
--- a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java
+++ b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java
@@ -1,14 +1,12 @@
package com.op.open.controller;
-import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.StringUtils;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.open.service.OpenService;
+import com.op.system.api.RemoteQualityService;
import com.op.system.api.domain.device.EquRepairOrderDTO;
import com.op.system.api.domain.dto.WCSDTO;
-import com.op.system.api.domain.mes.MesReportWorkDTO;
-import com.op.system.api.domain.quality.QcCheckTaskDTO;
import com.op.system.api.domain.quality.QcCheckTaskProduceDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -90,23 +88,18 @@ public class OpenController extends BaseController {
if(StringUtils.isBlank(qcCheckTaskProduce.getOrderNo())){
return error("[orderNo]不能为空");
}
-
if(StringUtils.isBlank(qcCheckTaskProduce.getMaterialName())){
return error("[materialName]不能为空");
}
-
if(StringUtils.isBlank(qcCheckTaskProduce.getMaterialCode())){
return error("[materialCode]不能为空");
}
-
if(StringUtils.isBlank(qcCheckTaskProduce.getCheckType())){
return error("[checkType]不能为空");
}
-
if(StringUtils.isBlank(qcCheckTaskProduce.getFactoryCode())){
return error("[factoryCode]不能为空");
}
-
//添加检测任务
return toAjax(openService.insertQcCheckTaskProduce(qcCheckTaskProduce));
}
@@ -147,12 +140,12 @@ public class OpenController extends BaseController {
/**
* 获取流程节点
- * @param requestId
+ * @param requestid
* @return
*/
- @GetMapping("/GetOaNodeInfo")
- public AjaxResult GetOaNodeInfo(@RequestParam("requestId") String requestId) {
- return openService.GetOaNodeInfo(requestId);
+ @GetMapping("/GetOaNodeInfo/{requestid}")
+ public AjaxResult GetOaNodeInfo(@PathVariable("requestid") String requestid) {
+ return openService.GetOaNodeInfo(requestid);
}
/**
diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
index e414b782..a6c055a7 100644
--- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
+++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
@@ -362,6 +362,7 @@ public class OpenServiceImpl implements OpenService {
user.setCreateTime(nowDate);
}
}
+ /**qc_check_task_user**/
int m = openMapper.addCheckUsers(users);
logger.info("检查人新增" + m + "成功");
@@ -392,6 +393,8 @@ public class OpenServiceImpl implements OpenService {
qcCheckTaskProduce.setIncomeTime(qcCheckTaskProduce.getProduceDate());
qcCheckTaskProduce.setSupplierCode(qcCheckTaskProduce.getCarCode());
qcCheckTaskProduce.setSupplierName(qcCheckTaskProduce.getCarName());
+ qcCheckTaskProduce.setCheckManName(null);
+ qcCheckTaskProduce.setCheckManCode(null);
openMapper.insertQcCheckTaskProduce(qcCheckTaskProduce);
/**qc_check_task_detail**/
for (QcCheckTaskDetailDTO item : items) {
@@ -414,6 +417,8 @@ public class OpenServiceImpl implements OpenService {
String requestName = paramMap.get("requestName").toString();
String workflowId = paramMap.get("workflowId").toString();
String mainObject = paramMap.get("mainObject").toString();
+
+
// Building the postData string using StringBuilder
StringBuilder postDataBuilder = new StringBuilder();
postDataBuilder.append("user=").append(user)
@@ -427,7 +432,7 @@ public class OpenServiceImpl implements OpenService {
}
String postData = postDataBuilder.toString();
String result = HttpUtils.sendPostOA(oa_url, postData);
- System.out.println(result);
+ logger.info(result);
//返回示例{"result":"0","info":"成功","requestid":"2193799"}
Map resultMap=JSONObject.parseObject(result);
if (resultMap.get("result").equals(Constants.LOGIN_SUCCESS_STATUS)){
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
index 34be5801..9bd51bca 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
@@ -133,7 +133,7 @@ public interface ProOrderWorkorderMapper {
List selectProOrderWorkerderByWorkerIds(String[] ids);
- public void updateWorkOrderCodeSap(ProOrderWorkorder oworkSap);
+ public int updateWorkOrderCodeSap(ProOrderWorkorder oworkSap);
/**
* 通过工艺code查询工艺名称
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
index f0763aa6..b6ab006d 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
@@ -288,7 +288,7 @@ public class ProOrderServiceImpl implements IProOrderService {
BigDecimal newSapQuantityNum = new BigDecimal(proOrder.getQuantity())
.subtract(new BigDecimal(proOrder.getQuantitySplit()));
sapChange.setQuantity(newSapQuantityNum.toString());//母订单新数量
- logger.info("母订单"+proOrder.getOrderCode()+
+ logger.info("【成品订单拆分】母订单"+proOrder.getOrderCode()+
"订单数量变更：修改前"+proOrder.getQuantity()+","+
",已拆数量"+proOrder.getQuantitySplit()+","+
"给sap汇报数量"+newSapQuantityNum.toString());
@@ -302,7 +302,7 @@ public class ProOrderServiceImpl implements IProOrderService {
workOrder.setBelongWorkOrder(belongWorkOrder);
workOrder.setProdType("LJ01");
- // 将工单信息更新至数据库
+ // 将工单信息更新至数据库/**pro_order_workorder**/
proOrderWorkorderMapper.insertProOrderWorkorder(workOrder);
// 生成批次表信息并更新至数据库
setBatch(workBatch, splitOrderDTO.getFormFields(), workOrder.getWorkorderId(), conver);
@@ -940,7 +940,7 @@ public class ProOrderServiceImpl implements IProOrderService {
// 拆分中
proOrder.setStatus("o1");
}
- // 更新订单表
+ // 更新订单表/**pro_order**/
proOrderMapper.updateOrder(proOrder);
// 生成对应的工单表
// 生成id
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
index 16dbb893..45379106 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
@@ -320,8 +320,10 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
R>> r = remoteSapService.SapCreateOrder(sapList);
logger.info("sap工单回传：" + r.getMsg());
if (500 == r.getCode()) {
- logger.error("sap工单回传：(sap订单创建)" + r.getMsg());
+ logger.error("工单派发sap工单回传：(sap订单创建失败)" + r.getMsg());
return 0;
+ }else{
+ logger.info("工单派发sap工单回传：(sap订单创建成功)" + JSONObject.toJSONString(r));
}
List> returnMaps = r.getData();
List returnCodes = new ArrayList<>();
@@ -339,27 +341,23 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
oworkSap.setWorkorderId(wcodes.get(m));//工单编码
oworkSap.setUpdateTime(updateTime);
/**pro_order_workorder**/
- proOrderWorkorderMapper.updateWorkOrderCodeSap(oworkSap);
+ int n = proOrderWorkorderMapper.updateWorkOrderCodeSap(oworkSap);
+ logger.info("工单派发pro_order_workorder："+n);
}
}
-//测试
-// List returnCodes = new ArrayList<>();
-// returnCodes.add("000100305879");
-// returnCodes.add("000100305878");
-
//获取领料单
this.getMesPrepare(returnCodes,wcodes);
- //关闭母子订单//订单的订单编码
- SapCloseOrderQuery sapCloseOrderQuery = new SapCloseOrderQuery();
- sapCloseOrderQuery.setLeadOrder(ordercodes.get(0));
- sapCloseOrderQuery.setOrder(ordercodes.get(1));
- R closeR= remoteSapService.sapCloseOrder(sapCloseOrderQuery);
- logger.info(whiteOrder.getWorkorderCode()+"下发工单后关闭母订单"+sapCloseOrderQuery.getLeadOrder()+":"+
- sapCloseOrderQuery.getOrder()+":"+
- closeR.getCode()+","+
- closeR.getMsg()+","+
- closeR.getData());
+// //关闭母子订单//订单的订单编码(关闭订单暂时隐藏)
+// SapCloseOrderQuery sapCloseOrderQuery = new SapCloseOrderQuery();
+// sapCloseOrderQuery.setLeadOrder(ordercodes.get(0));
+// sapCloseOrderQuery.setOrder(ordercodes.get(1));
+// R closeR= remoteSapService.sapCloseOrder(sapCloseOrderQuery);
+// logger.info(whiteOrder.getWorkorderCode()+"下发工单后关闭母订单"+sapCloseOrderQuery.getLeadOrder()+":"+
+// sapCloseOrderQuery.getOrder()+":"+
+// closeR.getCode()+","+
+// closeR.getMsg()+","+
+// closeR.getData());
//下达工单
String[] idsArrayAll = (String[])wids.toArray(new String[wids.size()]);
proOrderWorkorderMapper.downWorkorders(idsArrayAll);
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportInventoryController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportInventoryController.java
index eed07714..1239b341 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportInventoryController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportInventoryController.java
@@ -39,7 +39,7 @@ public class QcCheckReportInventoryController extends BaseController {
/**
* 查询来料检验列表
*/
- @RequiresPermissions("quality:incomeReport:list")
+ @RequiresPermissions("quality:inventoryReport:list")
@GetMapping("/list")
public TableDataInfo list(QcCheckReportIncome qcCheckReportIncome) {
@@ -66,7 +66,7 @@ public class QcCheckReportInventoryController extends BaseController {
/**
* 导出来料检验列表
*/
- @RequiresPermissions("quality:incomeReport:export")
+ @RequiresPermissions("quality:inventoryReport:export")
@Log(title = "来料检验", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, QcCheckReportIncome qcCheckReportIncome) {
@@ -94,7 +94,7 @@ public class QcCheckReportInventoryController extends BaseController {
/**
* 获取来料检验详细信息
*/
- @RequiresPermissions("quality:incomeReport:query")
+ @RequiresPermissions("quality:inventoryReport:query")
@GetMapping(value = "/{recordId}")
public AjaxResult getInfo(@PathVariable("recordId") String recordId) {
return success(qcCheckReportInventoryService.selectQcCheckReportIncomeByRecordId(recordId));
@@ -103,7 +103,6 @@ public class QcCheckReportInventoryController extends BaseController {
/**
* 新增来料检验
*/
- @RequiresPermissions("quality:incomeReport:add")
@Log(title = "来料检验", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody QcCheckReportIncome qcCheckReportIncome) {
@@ -117,7 +116,6 @@ public class QcCheckReportInventoryController extends BaseController {
/**
* 修改来料检验
*/
- @RequiresPermissions("quality:incomeReport:edit")
@Log(title = "来料检验", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody QcCheckReportIncome qcCheckReportIncome) {
@@ -127,7 +125,6 @@ public class QcCheckReportInventoryController extends BaseController {
/**
* 删除来料检验
*/
- @RequiresPermissions("quality:incomeReport:remove")
@Log(title = "来料检验", businessType = BusinessType.DELETE)
@DeleteMapping("/{recordIds}")
public AjaxResult remove(@PathVariable String[] recordIds) {
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java
index aa9aafc6..1f35b6ca 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java
@@ -40,15 +40,15 @@ public class QcCheckReportProduceController extends BaseController {
@GetMapping("/list")
public TableDataInfo list(QcCheckReportIncome qcCheckReportIncome) {
- //默认时间范围T 00:00:00~T+1 00:00:00
- if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){
- qcCheckReportIncome.setCheckTimeStart(DateUtils.getDate()+" 00:00:00");//start
- LocalDate date = LocalDate.now();
- LocalDate dateEnd = date.plusDays(1);
- DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- String dateEndStr = dtf.format(dateEnd)+" 00:00:00";
- qcCheckReportIncome.setCheckTimeEnd(dateEndStr);//end
- }
+// //默认时间范围T 00:00:00~T+1 00:00:00
+// if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){
+// qcCheckReportIncome.setCheckTimeStart(DateUtils.getDate()+" 00:00:00");//start
+// LocalDate date = LocalDate.now();
+// LocalDate dateEnd = date.plusDays(1);
+// DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+// String dateEndStr = dtf.format(dateEnd)+" 00:00:00";
+// qcCheckReportIncome.setCheckTimeEnd(dateEndStr);//end
+// }
startPage();
List list = qcCheckReportProduceService.selectQcCheckReportIncomeList(qcCheckReportIncome);
@@ -63,15 +63,15 @@ public class QcCheckReportProduceController extends BaseController {
@PostMapping("/export")
public void export(HttpServletResponse response, QcCheckReportIncome qcCheckReportIncome) {
- //默认时间范围T 00:00:00~T+1 00:00:00
- if(StringUtils.isEmpty(qcCheckReportIncome.getIncomeTimeStart())){
- qcCheckReportIncome.setIncomeTimeStart(DateUtils.getDate()+" 00:00:00");//start
- LocalDate date = LocalDate.now();
- LocalDate dateEnd = date.plusDays(1);
- DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- String dateEndStr = dtf.format(dateEnd)+" 00:00:00";
- qcCheckReportIncome.setIncomeTimeEnd(dateEndStr);//end
- }
+// //默认时间范围T 00:00:00~T+1 00:00:00
+// if(StringUtils.isEmpty(qcCheckReportIncome.getIncomeTimeStart())){
+// qcCheckReportIncome.setIncomeTimeStart(DateUtils.getDate()+" 00:00:00");//start
+// LocalDate date = LocalDate.now();
+// LocalDate dateEnd = date.plusDays(1);
+// DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+// String dateEndStr = dtf.format(dateEnd)+" 00:00:00";
+// qcCheckReportIncome.setIncomeTimeEnd(dateEndStr);//end
+// }
// if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){
// qcCheckReportIncome.setCheckTimeStart(qcCheckReportIncome.getIncomeTimeStart());//start
@@ -181,4 +181,15 @@ public class QcCheckReportProduceController extends BaseController {
QcCheckTaskProduce dto = qcCheckReportProduceService.getProduceReportXJ(qcCheckTaskProduce);
return dto;
}
+ // 生产过程报告任务详情
+ @PostMapping("/getTaskInfo")
+ public QcCheckReportIncome getTaskInfo(@RequestBody QcCheckReportIncome qcCheckReportIncome) {
+ QcCheckReportIncome dto = qcCheckReportProduceService.getTaskInfo(qcCheckReportIncome);
+ return dto;
+ }
+
+ @PostMapping("/submitConfirm")
+ public AjaxResult submitConfirm(@RequestBody QcCheckReportIncome qcCheckReportIncome) {
+ return toAjax(qcCheckReportProduceService.submitConfirm(qcCheckReportIncome));
+ }
}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java
index cdf0aa79..c86a2a3f 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java
@@ -135,6 +135,34 @@ public class QcCheckTaskIncomeController extends BaseController {
public AjaxResult createIncomeTask(@RequestBody QcCheckTaskIncomeDTO qcCheckTaskIncome0) {
QcCheckTaskIncome qcCheckTaskIncome = new QcCheckTaskIncome();
BeanUtils.copyProperties(qcCheckTaskIncome0,qcCheckTaskIncome);
+
+ if(StringUtils.isBlank(qcCheckTaskIncome.getOrderNo())){
+ return error("[orderNo]不能为空");
+ }
+ if(StringUtils.isBlank(qcCheckTaskIncome.getMaterialName())){
+ return error("[materialName]不能为空");
+ }
+ if(StringUtils.isBlank(qcCheckTaskIncome.getMaterialCode())){
+ return error("[materialCode]不能为空");
+ }
+ if(StringUtils.isBlank(qcCheckTaskIncome.getCheckType())){
+ return error("[checkType]不能为空");
+ }
+ if(StringUtils.isBlank(qcCheckTaskIncome.getFactoryCode())){
+ return error("[factoryCode]不能为空");
+ }
+ if(StringUtils.isBlank(qcCheckTaskIncome.getSupplierCode())){
+ return error("[supplierCode]不能为空");
+ }
+ if(StringUtils.isBlank(qcCheckTaskIncome.getSupplierName())){
+ return error("[supplierName]不能为空");
+ }
+ if(qcCheckTaskIncome.getIncomeTime()==null){
+ return error("[incomeTime]不能为空");
+ }
+ logger.info("来料检验任务生成开始================================");
+ logger.info("来料检验任务生成参数："+ JSONObject.toJSONString(qcCheckTaskIncome));
+
int r = qcCheckTaskIncomeService.insertQcCheckTaskIncome(qcCheckTaskIncome);
if(r>0){
return toAjax(r);
@@ -273,4 +301,16 @@ public class QcCheckTaskIncomeController extends BaseController {
public List getBatchList(@RequestBody QcCheckTaskIncome qcCheckTaskIncome) {
return qcCheckTaskIncomeService.getBatchList(qcCheckTaskIncome);
}
+
+ /**
+ * 订单巡检任务专用列表
+ * @param
+ * @return
+ */
+ @GetMapping("/getCkeckProjectXJList")
+ public TableDataInfo getCkeckProjectXJList(QcCheckTaskIncome qcCheckTaskIncome) {
+ startPage();
+ List list = qcCheckTaskIncomeService.getCkeckProjectXJList(qcCheckTaskIncome);
+ return getDataTable(list);
+ }
}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckUnqualifiedController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckUnqualifiedController.java
index 8be77956..108e6670 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckUnqualifiedController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckUnqualifiedController.java
@@ -1,12 +1,9 @@
package com.op.quality.controller;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
-import com.op.common.core.utils.DateUtils;
-import org.apache.commons.lang.StringUtils;
+import com.op.system.api.domain.quality.OAInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -120,4 +117,14 @@ public class QcCheckUnqualifiedController extends BaseController {
public AjaxResult remove(@PathVariable String[] ids) {
return toAjax(qcCheckUnqualifiedService.deleteQcCheckUnqualifiedByIds(ids));
}
+
+ /**
+ * 查询oa审批流程列表
+ */
+ @RequiresPermissions("quality:unqualified:list")
+ @GetMapping("/getOAInfoList")
+ public List getOAInfoList(QcCheckUnqualified qcCheckUnqualified) {
+ List list = qcCheckUnqualifiedService.getOAInfoList(qcCheckUnqualified);
+ return list;
+ }
}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java
index d3047883..56be1e53 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java
@@ -23,7 +23,7 @@ import com.op.common.core.web.page.TableDataInfo;
/**
* 物料组Controller
- *
+ *
* @author materialGroup
* @date 2023-10-16
*/
@@ -36,7 +36,7 @@ public class QcMaterialGroupController extends BaseController {
/**
* 查询物料组列表
*/
- @RequiresPermissions("quality:materialGroup:list")
+ //@RequiresPermissions("quality:materialGroup:list")
@GetMapping("/list")
public TableDataInfo list(QcMaterialGroup qcMaterialGroup) {
startPage();
@@ -55,7 +55,7 @@ public class QcMaterialGroupController extends BaseController {
/**
* 导出物料组列表
*/
- @RequiresPermissions("quality:materialGroup:export")
+ //@RequiresPermissions("quality:materialGroup:export")
@Log(title = "物料组", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, QcMaterialGroup qcMaterialGroup) {
@@ -67,7 +67,7 @@ public class QcMaterialGroupController extends BaseController {
/**
* 获取物料组详细信息
*/
- @RequiresPermissions("quality:materialGroup:query")
+ //@RequiresPermissions("quality:materialGroup:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) {
return success(qcMaterialGroupService.selectQcMaterialGroupById(id));
@@ -86,7 +86,7 @@ public class QcMaterialGroupController extends BaseController {
/**
* 修改物料组
*/
- @RequiresPermissions("quality:materialGroup:edit")
+ //@RequiresPermissions("quality:materialGroup:edit")
@Log(title = "物料组", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody QcMaterialGroup qcMaterialGroup) {
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java
index b117e65e..4303edf4 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java
@@ -126,6 +126,97 @@ public class QcCheckReportIncome extends BaseEntity {
private String checkType;//小类
private String checkName;
private String createTimeStr;
+ private List files;
+ private List fileUrls;
+ private String reason;
+ private String productType;
+ private String confirm;
+ private String confirmManCode;
+ private String confirmManName;
+ private String confirmRemark;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date confirmTime;
+ private Boolean myself;
+
+ public Boolean getMyself() {
+ return myself;
+ }
+
+ public void setMyself(Boolean myself) {
+ this.myself = myself;
+ }
+
+ public Date getConfirmTime() {
+ return confirmTime;
+ }
+
+ public void setConfirmTime(Date confirmTime) {
+ this.confirmTime = confirmTime;
+ }
+
+ public String getConfirmRemark() {
+ return confirmRemark;
+ }
+
+ public void setConfirmRemark(String confirmRemark) {
+ this.confirmRemark = confirmRemark;
+ }
+
+ public String getConfirm() {
+ return confirm;
+ }
+
+ public void setConfirm(String confirm) {
+ this.confirm = confirm;
+ }
+
+ public String getConfirmManCode() {
+ return confirmManCode;
+ }
+
+ public void setConfirmManCode(String confirmManCode) {
+ this.confirmManCode = confirmManCode;
+ }
+
+ public String getConfirmManName() {
+ return confirmManName;
+ }
+
+ public void setConfirmManName(String confirmManName) {
+ this.confirmManName = confirmManName;
+ }
+
+ public String getReason() {
+ return reason;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+
+ public String getProductType() {
+ return productType;
+ }
+
+ public void setProductType(String productType) {
+ this.productType = productType;
+ }
+
+ public List getFileUrls() {
+ return fileUrls;
+ }
+
+ public void setFileUrls(List fileUrls) {
+ this.fileUrls = fileUrls;
+ }
+
+ public List getFiles() {
+ return files;
+ }
+
+ public void setFiles(List files) {
+ this.files = files;
+ }
public String getCreateTimeStr() {
return createTimeStr;
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java
index 67d5a108..ee082dcd 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java
@@ -98,6 +98,15 @@ public class QcCheckTaskDetail extends BaseEntity {
private String checkType;
private String fileListStr;
private List files;
+ private List fileUrls;
+
+ public List getFileUrls() {
+ return fileUrls;
+ }
+
+ public void setFileUrls(List fileUrls) {
+ this.fileUrls = fileUrls;
+ }
@Override
public String getRemark() {
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java
index e51f28c6..9f10f97e 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java
@@ -142,6 +142,24 @@ public class QcCheckTaskIncome extends BaseEntity {
private String remark;
private String belongTo;
private String oldBelongTo;
+ private String noOkQualityNames;
+ private String noOkQualityVals;
+
+ public String getNoOkQualityNames() {
+ return noOkQualityNames;
+ }
+
+ public void setNoOkQualityNames(String noOkQualityNames) {
+ this.noOkQualityNames = noOkQualityNames;
+ }
+
+ public String getNoOkQualityVals() {
+ return noOkQualityVals;
+ }
+
+ public void setNoOkQualityVals(String noOkQualityVals) {
+ this.noOkQualityVals = noOkQualityVals;
+ }
public String getOldBelongTo() {
return oldBelongTo;
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java
index 120227d3..1daa776a 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java
@@ -150,6 +150,42 @@ public class QcCheckTaskProduce extends BaseEntity {
private String checkName;
private List checkInfos;
private List defects;
+ private String reason;
+ private String productType;
+ private String confirmManCode;
+ private String confirmManName;
+
+ public String getConfirmManCode() {
+ return confirmManCode;
+ }
+
+ public void setConfirmManCode(String confirmManCode) {
+ this.confirmManCode = confirmManCode;
+ }
+
+ public String getConfirmManName() {
+ return confirmManName;
+ }
+
+ public void setConfirmManName(String confirmManName) {
+ this.confirmManName = confirmManName;
+ }
+
+ public String getReason() {
+ return reason;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+
+ public String getProductType() {
+ return productType;
+ }
+
+ public void setProductType(String productType) {
+ this.productType = productType;
+ }
public List getDefects() {
return defects;
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java
index 8d27e183..4a20c460 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskWarehousing.java
@@ -2,6 +2,8 @@ package com.op.quality.domain;
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -112,6 +114,7 @@ public class QcCheckTaskWarehousing extends BaseEntity {
/** 删除标识1删除0正常 */
private String delFlag;
+ private List defects;
private String incomeTimeStart;
private String incomeTimeEnd;
@@ -122,6 +125,41 @@ public class QcCheckTaskWarehousing extends BaseEntity {
private String orderType;
private BigDecimal noOkQuality;
private BigDecimal sampleQuality;
+ private BigDecimal aNoOkquality;
+ private BigDecimal bNoOkquality;
+ private BigDecimal cNoOkquality;
+
+ public BigDecimal getaNoOkquality() {
+ return aNoOkquality;
+ }
+
+ public void setaNoOkquality(BigDecimal aNoOkquality) {
+ this.aNoOkquality = aNoOkquality;
+ }
+
+ public BigDecimal getbNoOkquality() {
+ return bNoOkquality;
+ }
+
+ public void setbNoOkquality(BigDecimal bNoOkquality) {
+ this.bNoOkquality = bNoOkquality;
+ }
+
+ public BigDecimal getcNoOkquality() {
+ return cNoOkquality;
+ }
+
+ public void setcNoOkquality(BigDecimal cNoOkquality) {
+ this.cNoOkquality = cNoOkquality;
+ }
+
+ public List getDefects() {
+ return defects;
+ }
+
+ public void setDefects(List defects) {
+ this.defects = defects;
+ }
public BigDecimal getSampleQuality() {
return sampleQuality;
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java
index f70f798a..4d022ac7 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java
@@ -73,4 +73,12 @@ public interface QcCheckReportIncomeMapper {
List getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail);
QcCheckTaskProduce getTopInfo(QcCheckTaskProduce qcCheckTaskProduce);
+
+ QcCheckReportIncome getTaskInfo(QcCheckReportIncome qcCheckReportIncome);
+
+ int submitConfirm(QcCheckReportIncome qcCheckReportIncome);
+
+ QcCheckReportIncome getXJTaskInfo(QcCheckReportIncome qcCheckReportIncome);
+
+ QcCheckReportIncome getLastXJTaskInfo(QcCheckReportIncome qcCheckReportIncome);
}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java
index 264f19ab..be6d5fd6 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java
@@ -98,4 +98,8 @@ public interface QcCheckTaskIncomeMapper {
List getDefectType(QcCheckTaskDetail qcCheckTaskDetail);
QcCheckTaskIncome getTaskInfo(String recordId);
+
+ int deleteQcCheckTaskDefects(String belongId);
+
+ List getCkeckTaskXJList(QcCheckTaskIncome qcCheckTaskIncome);
}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcSampleRuleMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcSampleRuleMapper.java
index 02a8e062..8a94ee8f 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcSampleRuleMapper.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcSampleRuleMapper.java
@@ -2,12 +2,13 @@ package com.op.quality.mapper;
import java.util.List;
+import com.op.quality.domain.QcCheckTaskIncome;
import com.op.quality.domain.QcSampleRule;
import org.apache.ibatis.annotations.Mapper;
/**
* 来料抽样规则Mapper接口
- *
+ *
* @author Open Platform
* @date 2023-12-28
*/
@@ -15,7 +16,7 @@ import org.apache.ibatis.annotations.Mapper;
public interface QcSampleRuleMapper {
/**
* 查询来料抽样规则
- *
+ *
* @param id 来料抽样规则主键
* @return 来料抽样规则
*/
@@ -23,7 +24,7 @@ public interface QcSampleRuleMapper {
/**
* 查询来料抽样规则列表
- *
+ *
* @param qcSampleRule 来料抽样规则
* @return 来料抽样规则集合
*/
@@ -31,7 +32,7 @@ public interface QcSampleRuleMapper {
/**
* 新增来料抽样规则
- *
+ *
* @param qcSampleRule 来料抽样规则
* @return 结果
*/
@@ -39,7 +40,7 @@ public interface QcSampleRuleMapper {
/**
* 修改来料抽样规则
- *
+ *
* @param qcSampleRule 来料抽样规则
* @return 结果
*/
@@ -47,7 +48,7 @@ public interface QcSampleRuleMapper {
/**
* 删除来料抽样规则
- *
+ *
* @param id 来料抽样规则主键
* @return 结果
*/
@@ -55,9 +56,11 @@ public interface QcSampleRuleMapper {
/**
* 批量删除来料抽样规则
- *
+ *
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteQcSampleRuleByIds(String[] ids);
+
+ String getSampNum(QcCheckTaskIncome qcCheckTaskIncome);
}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportProduceService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportProduceService.java
index 587c4f61..eb82803e 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportProduceService.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportProduceService.java
@@ -71,4 +71,8 @@ public interface IQcCheckReportProduceService {
List getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail);
QcCheckTaskProduce getProduceReportXJ(QcCheckTaskProduce qcCheckTaskProduce);
+
+ QcCheckReportIncome getTaskInfo(QcCheckReportIncome qcCheckReportIncome);
+
+ int submitConfirm(QcCheckReportIncome qcCheckReportIncome);
}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java
index 981fb81d..48a1a7be 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java
@@ -87,4 +87,6 @@ public interface IQcCheckTaskIncomeService {
List getBatchList(QcCheckTaskIncome qcCheckTaskIncome);
List getProductWorkOrder(QcCheckTaskIncome qcCheckTaskIncome);
+
+ List getCkeckProjectXJList(QcCheckTaskIncome qcCheckTaskIncome);
}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckUnqualifiedService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckUnqualifiedService.java
index 962b39e7..bd40c198 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckUnqualifiedService.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckUnqualifiedService.java
@@ -1,18 +1,20 @@
package com.op.quality.service;
import java.util.List;
+
+import com.op.system.api.domain.quality.OAInfo;
import com.op.quality.domain.QcCheckUnqualified;
/**
* 不合格处理Service接口
- *
+ *
* @author Open Platform
* @date 2023-10-31
*/
public interface IQcCheckUnqualifiedService {
/**
* 查询不合格处理
- *
+ *
* @param id 不合格处理主键
* @return 不合格处理
*/
@@ -20,7 +22,7 @@ public interface IQcCheckUnqualifiedService {
/**
* 查询不合格处理列表
- *
+ *
* @param qcCheckUnqualified 不合格处理
* @return 不合格处理集合
*/
@@ -28,7 +30,7 @@ public interface IQcCheckUnqualifiedService {
/**
* 新增不合格处理
- *
+ *
* @param qcCheckUnqualified 不合格处理
* @return 结果
*/
@@ -36,7 +38,7 @@ public interface IQcCheckUnqualifiedService {
/**
* 修改不合格处理
- *
+ *
* @param qcCheckUnqualified 不合格处理
* @return 结果
*/
@@ -44,7 +46,7 @@ public interface IQcCheckUnqualifiedService {
/**
* 批量删除不合格处理
- *
+ *
* @param ids 需要删除的不合格处理主键集合
* @return 结果
*/
@@ -52,9 +54,11 @@ public interface IQcCheckUnqualifiedService {
/**
* 删除不合格处理信息
- *
+ *
* @param id 不合格处理主键
* @return 结果
*/
public int deleteQcCheckUnqualifiedById(String id);
+
+ List getOAInfoList(QcCheckUnqualified qcCheckUnqualified);
}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java
index 48e93eba..15c8d853 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java
@@ -39,7 +39,8 @@ public class QcCheckReportIncomeServiceImpl implements IQcCheckReportIncomeServi
@Autowired
private QcCheckTaskDetailMapper qcCheckTaskDetailMapper;
-
+ @Autowired
+ private QMSFileMapper qmsFileMapper;
/**
* 查询来料检验
*
@@ -192,7 +193,15 @@ public class QcCheckReportIncomeServiceImpl implements IQcCheckReportIncomeServi
@Override
@DS("#header.poolName")
public List getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail) {
- return qcCheckReportIncomeMapper.getCkeckProjectList(qcCheckTaskDetail);
+ List dtos = qcCheckReportIncomeMapper.getCkeckProjectList(qcCheckTaskDetail);
+ for(QcCheckTaskDetail dto:dtos){
+ List files = qmsFileMapper.getBaseFileBatch(dto.getRecordId());
+ if (!CollectionUtils.isEmpty(files)) {
+ dto.setFiles(files);
+ }
+ }
+
+ return dtos;
}
@Override
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java
index 139a58d4..69576ee2 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java
@@ -9,6 +9,8 @@ import com.op.quality.mapper.*;
import com.op.quality.service.IQcCheckReportProduceService;
import com.op.quality.service.IQcStaticTableService;
import com.op.system.api.domain.SysUser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -27,6 +29,7 @@ import java.util.List;
*/
@Service
public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceService {
+ protected Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
private QcCheckReportIncomeMapper qcCheckReportIncomeMapper;
@Autowired
@@ -51,7 +54,8 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer
@Override
@DS("#header.poolName")
public QcCheckReportIncome selectQcCheckReportIncomeByRecordId(String recordId) {
- return qcCheckReportIncomeMapper.selectQcCheckReportIncomeByRecordId(recordId);
+ QcCheckReportIncome dto= qcCheckReportIncomeMapper.selectQcCheckReportIncomeByRecordId(recordId);
+ return dto;
}
/**
@@ -208,4 +212,50 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer
return produce;
}
+ @Override
+ @DS("#header.poolName")
+ public QcCheckReportIncome getTaskInfo(QcCheckReportIncome qcCheckReportIncome) {
+ QcCheckReportIncome taskInfo = null;
+ if("checkTypeSC".equals(qcCheckReportIncome.getCheckType())){
+ taskInfo = qcCheckReportIncomeMapper.getTaskInfo(qcCheckReportIncome);
+
+ }else if("checkTypeSCXJ".equals(qcCheckReportIncome.getCheckType())){
+ taskInfo = qcCheckReportIncomeMapper.getXJTaskInfo(qcCheckReportIncome);
+ //最后一条巡检记录得确认人当最终确认人
+ QcCheckReportIncome lastData = qcCheckReportIncomeMapper.getLastXJTaskInfo(qcCheckReportIncome);
+ if(lastData!=null ){
+ taskInfo.setConfirmManCode(lastData.getConfirmManCode());
+ taskInfo.setConfirmManName(lastData.getConfirmManName());
+ taskInfo.setConfirm(lastData.getConfirm());
+ taskInfo.setConfirmTime(lastData.getConfirmTime());
+ taskInfo.setConfirmRemark(lastData.getConfirmRemark());
+ }
+ if(SecurityUtils.getUsername().equals(taskInfo.getConfirmManCode())){
+ taskInfo.setMyself(true);
+ }else{
+ taskInfo.setMyself(false);
+ }
+ }
+
+ return taskInfo;
+ }
+
+ @Override
+ @DS("#header.poolName")
+ public int submitConfirm(QcCheckReportIncome qcCheckReportIncome) {
+ Date nowTime = DateUtils.getNowDate();
+ String nowManCode = SecurityUtils.getUsername();
+ String nowManName = SecurityUtils.getLoginUser().getSysUser().getNickName();
+ if("checkTypeSC".equals(qcCheckReportIncome.getCheckType())||"checkTypeSCXJ".equals(qcCheckReportIncome.getCheckType())){
+ qcCheckReportIncome.setConfirmManCode(nowManCode);
+ qcCheckReportIncome.setConfirmManName(nowManName);
+ qcCheckReportIncome.setConfirmTime(nowTime);
+ /**qc_check_task**/
+ int n = qcCheckReportIncomeMapper.submitConfirm(qcCheckReportIncome);
+ logger.info("qc_check_task：【二次确认】"+qcCheckReportIncome.getCheckType()+":"+n);
+ return n;
+ }
+ return 0;
+ }
+
}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskDefectServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskDefectServiceImpl.java
index 3e68774b..8ba607e8 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskDefectServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskDefectServiceImpl.java
@@ -106,11 +106,13 @@ public class QcCheckTaskDefectServiceImpl implements IQcCheckTaskDefectService {
}
@Override
+ @DS("#header.poolName")
public int deleteQcCheckTaskDefectByBelongTo(String belongTo) {
return qcCheckTaskDefectMapper.deleteQcCheckTaskDefectByBelongTo(belongTo);
}
@Override
+ @DS("#header.poolName")
public List selectDefectByBelongTo(String belongTo) {
return qcCheckTaskDefectMapper.selectDefectByBelongTo(belongTo);
}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
index e799f5dd..3a3b68c8 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
@@ -2,6 +2,8 @@ package com.op.quality.service.impl;
import java.math.BigDecimal;
import java.util.*;
+import java.util.stream.Collectors;
+
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.JSONArray;
import com.baomidou.dynamic.datasource.annotation.DS;
@@ -14,6 +16,7 @@ import com.op.common.core.web.domain.AjaxResult;
import com.op.common.security.utils.SecurityUtils;
import com.op.quality.domain.*;
import com.op.quality.mapper.*;
+import com.op.quality.service.IQcCheckTaskDefectService;
import com.op.quality.service.IQcCheckTaskProduceService;
import com.op.quality.service.IQcCheckTaskUserService;
import com.op.system.api.RemoteOpenService;
@@ -73,6 +76,15 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
@Autowired
private QMSFileMapper qmsFileMapper;
+ @Autowired
+ private IQcCheckTaskDefectService qcCheckTaskDefectService;
+
+ @Autowired
+ private QcSampleRuleMapper qcSampleRuleMapper;
+
+ @Autowired
+ private QcCheckTaskDefectMapper qcCheckTaskDefectMapper;
+
/**
* 查询来料检验
*
@@ -91,6 +103,11 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
if (qcCheckTaskUser != null && StringUtils.isNotBlank(qcCheckTaskUser.getManCodes())) {
qcCheckTaskIncome.setCheckManCode(qcCheckTaskUser.getManCodes());
}
+ //获取不良品检验信息
+ List qcCheckTaskDefectList = qcCheckTaskDefectService.selectDefectByBelongTo(recordId);
+ if (!CollectionUtils.isEmpty(qcCheckTaskDefectList)) {
+ qcCheckTaskIncome.setDefects(qcCheckTaskDefectList);
+ }
return qcCheckTaskIncome;
}
@@ -210,6 +227,23 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
int m=qcCheckTaskIncomeMapper.addCheckUsers(users);
logger.info("检查人新增"+m+"成功");
}
+ /** 不良品数据插入 */
+ BigDecimal noOkQuality = new BigDecimal(0);
+ List defectList = qcCheckTaskIncome.getDefects();
+ if (!CollectionUtils.isEmpty(defectList)) {
+ for (QcCheckTaskDefect defect : defectList) {
+ defect.setBelongTo(beLongId);
+ qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
+ noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality());
+ }
+ }
+ qcCheckTaskIncome.setNoOkQuality(noOkQuality);
+ /**qc_sample_rule**/
+ String sampNum = qcSampleRuleMapper.getSampNum(qcCheckTaskIncome);
+ if(StringUtils.isNotBlank(sampNum)){
+ qcCheckTaskIncome.setSampleQuality(new BigDecimal(sampNum));
+ }
+ /**qc_check_task**/
qcCheckTaskIncomeMapper.insertQcCheckTaskIncome(qcCheckTaskIncome);
/**qc_check_task_detail**/
@@ -252,6 +286,21 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
qcCheckTaskUserList.add(qcCheckTaskUser);
}
qcCheckTaskUserService.updateQcCheckTaskUser(qcCheckTaskUserList);
+ /** 不良品数据修改 **/
+ BigDecimal noOkQuality = new BigDecimal(0);
+ List defectList = qcCheckTaskIncome.getDefects();
+ String belongTo = qcCheckTaskIncome.getRecordId();
+ //不是空执行下一步，空不做操作
+ if (!CollectionUtils.isEmpty(defectList)) {
+ qcCheckTaskDefectService.deleteQcCheckTaskDefectByBelongTo(belongTo);
+ for (QcCheckTaskDefect defect : defectList) {
+ defect.setBelongTo(belongTo);
+ qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
+ noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality());
+ }
+ }
+ qcCheckTaskIncome.setNoOkQuality(noOkQuality);
+
return qcCheckTaskIncomeMapper.updateQcCheckTaskIncome(qcCheckTaskIncome);
}
@@ -307,7 +356,16 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
@Override
@DS("#header.poolName")
public List getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail) {
- return qcCheckTaskIncomeMapper.getCkeckProjectList(qcCheckTaskDetail);
+ List dtos = qcCheckTaskIncomeMapper.getCkeckProjectList(qcCheckTaskDetail);
+ for(QcCheckTaskDetail detail:dtos){
+ List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
+ if (!CollectionUtils.isEmpty(files)) {
+ List urls = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
+ detail.setFiles(files);
+ detail.setFileUrls(urls);
+ }
+ }
+ return dtos;
}
@Override
@@ -440,15 +498,15 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
@DS("#header.poolName")
public List getWorkOrder(QcCheckTaskIncome qcCheckTaskIncome) {
List dtos = qcCheckUnqualifiedMapper.getWorkOrder(qcCheckTaskIncome);
- for(QcCheckTaskIncome dto:dtos){
- String statusName = "";
- if("w5".equals(dto.getStatus())){
- statusName = "质检完成";
- }else{
- statusName = "质检未完成";
- }
- dto.setStatus(statusName);
- }
+// for(QcCheckTaskIncome dto:dtos){
+// String statusName = "";
+// if("w5".equals(dto.getStatus())){
+// statusName = "质检完成";
+// }else{
+// statusName = "质检未完成";
+// }
+// dto.setStatus(statusName);
+// }
return dtos;
}
@@ -474,6 +532,41 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
return dtos;
}
+ @Override
+ @DS("#header.poolName")
+ public List getCkeckProjectXJList(QcCheckTaskIncome qcCheckTaskIncome) {
+ List dtos = qcCheckTaskIncomeMapper.getCkeckTaskXJList(qcCheckTaskIncome);
+ for(QcCheckTaskIncome dto:dtos){
+ //不良分类
+ QcCheckTaskDefect defectqo = new QcCheckTaskDefect();
+ defectqo.setBelongTo(dto.getRecordId());
+ List defects = qcCheckTaskDefectMapper.selectQcCheckTaskDefectList(defectqo);
+ if(!CollectionUtils.isEmpty(defects)){
+ List names = defects.stream().map(QcCheckTaskDefect::getDefectSubclass).collect(Collectors.toList());
+ dto.setNoOkQualityNames(names.toString());
+ List vals = defects.stream().map(QcCheckTaskDefect::getNoOkQuality).collect(Collectors.toList());
+ dto.setNoOkQualityVals(vals.toString());
+ }
+
+ //检测项列表
+ QcCheckTaskDetail detailqo = new QcCheckTaskDetail();
+ detailqo.setBelongTo(dto.getRecordId());
+ List qcCheckTaskDetails = qcCheckTaskDetailMapper.selectQcCheckTaskDetailList(detailqo);
+ if(!CollectionUtils.isEmpty(qcCheckTaskDetails)){
+ for(QcCheckTaskDetail qcCheckTaskDetail:qcCheckTaskDetails){
+ List files = qmsFileMapper.getBaseFileBatch(qcCheckTaskDetail.getRecordId());
+ if (!CollectionUtils.isEmpty(files)) {
+ List urls = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
+ qcCheckTaskDetail.setFiles(files);
+ qcCheckTaskDetail.setFileUrls(urls);
+ }
+ }
+ dto.setQcCheckTaskDetails(qcCheckTaskDetails);
+ }
+ }
+ return dtos;
+ }
+
@Override
@Transactional(rollbackFor = Exception.class)
public int commitCheckResults(QcCheckTaskIncome qcCheckTaskIncome) {
@@ -547,6 +640,8 @@ public class QcCheckTaskIncomeServiceImpl implements IQcCheckTaskIncomeService {
logger.info("更新qc_check_task_detail:"+n);
/**qc_check_task_defect**/
+ n=qcCheckTaskIncomeMapper.deleteQcCheckTaskDefects(belongId);
+ logger.info("清理qc_check_task_defect:"+n);
n= qcCheckTaskIncomeMapper.addQcCheckTaskDefects(defects);
logger.info("qc_check_task_defect:"+n);
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java
index 9f4f7f22..d1af1d7a 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java
@@ -1,5 +1,6 @@
package com.op.quality.service.impl;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -13,6 +14,7 @@ import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.security.utils.SecurityUtils;
import com.op.quality.domain.*;
import com.op.quality.mapper.*;
+import com.op.quality.service.IQcCheckTaskDefectService;
import com.op.quality.service.IQcCheckTaskUserService;
import com.op.system.api.domain.quality.QcUserMaterialDTO;
import org.slf4j.Logger;
@@ -52,6 +54,8 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
private IQcCheckTaskUserService qcCheckTaskUserService;
@Autowired
private QcCheckTaskIncomeMapper qcCheckTaskIncomeMapper;
+ @Autowired
+ private IQcCheckTaskDefectService qcCheckTaskDefectService;
/**
* 查询成品入库检验任务
@@ -71,6 +75,11 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
if (qcCheckTaskUser != null && StringUtils.isNotBlank(qcCheckTaskUser.getManCodes())) {
checkTaskWarehousing.setCheckManCode(qcCheckTaskUser.getManCodes());
}
+ //获取不良品检验信息
+ List qcCheckTaskDefectList = qcCheckTaskDefectService.selectDefectByBelongTo(recordId);
+ if (!CollectionUtils.isEmpty(qcCheckTaskDefectList)) {
+ checkTaskWarehousing.setDefects(qcCheckTaskDefectList);
+ }
return checkTaskWarehousing;
}
@@ -188,6 +197,18 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
int m=qcCheckTaskIncomeMapper.addCheckUsers(users);
logger.info("检查人新增"+m+"成功");
}
+ /** 不良品数据插入 */
+ BigDecimal noOkQuality = new BigDecimal(0);
+ List defectList = qcCheckTaskWarehousing.getDefects();
+ if (!CollectionUtils.isEmpty(defectList)) {
+ for (QcCheckTaskDefect defect : defectList) {
+ defect.setBelongTo(beLongId);
+ qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
+ noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality());
+ }
+ }
+ qcCheckTaskWarehousing.setNoOkQuality(noOkQuality);
+
/**qc_check_task**/
int n = qcCheckTaskWarehousingMapper.insertQcCheckTaskWarehousing(qcCheckTaskWarehousing);
logger.info("qc_check_task:"+n+"成功");
@@ -231,6 +252,20 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
qcCheckTaskUserList.add(qcCheckTaskUser);
}
qcCheckTaskUserService.updateQcCheckTaskUser(qcCheckTaskUserList);
+ /** 不良品数据修改 **/
+ BigDecimal noOkQuality = new BigDecimal(0);
+ List defectList = qcCheckTaskWarehousing.getDefects();
+ String belongTo = qcCheckTaskWarehousing.getRecordId();
+ //不是空执行下一步，空不做操作
+ if (!CollectionUtils.isEmpty(defectList)) {
+ qcCheckTaskDefectService.deleteQcCheckTaskDefectByBelongTo(belongTo);
+ for (QcCheckTaskDefect defect : defectList) {
+ defect.setBelongTo(belongTo);
+ qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
+ noOkQuality = noOkQuality.add(defect.getNoOkQuality()==null?new BigDecimal("0"):defect.getNoOkQuality());
+ }
+ }
+ qcCheckTaskWarehousing.setNoOkQuality(noOkQuality);
return qcCheckTaskWarehousingMapper.updateQcCheckTaskWarehousing(qcCheckTaskWarehousing);
}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java
index 6ac69090..c1d1a3ca 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java
@@ -1,16 +1,14 @@
package com.op.quality.service.impl;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.security.utils.SecurityUtils;
-import com.op.quality.domain.QcCheckProject;
+import com.op.system.api.domain.quality.OAInfo;
import com.op.quality.domain.QcCheckTaskIncome;
import com.op.quality.mapper.QcCheckTaskIncomeMapper;
import com.op.system.api.RemoteOpenService;
@@ -100,6 +98,7 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService
oaR = this.createLLOA(taskIfo);
}else if("produce".equals(taskIfo.getTypeCode())){
//ZL0030-品质异常流程
+ oaR = this.createProduceOA(taskIfo);
}else if("product".equals(taskIfo.getTypeCode())) {
//ZL0020-成品检验控制流程
oaR = this.createProductOA(taskIfo);
@@ -109,10 +108,13 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService
/**qc_check_unqualified**/
qcCheckUnqualified.setRequestid(oaR.get("data").toString());
qcCheckUnqualified.setStartOaStatus("1");
+ qcCheckUnqualified.setStatus("1");
+ qcCheckUnqualified.setStartTime(nowTime);
int m = qcCheckUnqualifiedMapper.updateQcCheckUnqualified(qcCheckUnqualified);
return m;
}else{
qcCheckUnqualified.setStartOaStatus("2");
+ qcCheckUnqualified.setStartTime(nowTime);
qcCheckUnqualified.setStartOaMsg(oaR.get("msg").toString());
qcCheckUnqualifiedMapper.updateQcCheckUnqualified(qcCheckUnqualified);
return 0;
@@ -146,6 +148,20 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService
return qcCheckUnqualifiedMapper.deleteQcCheckUnqualifiedById(id);
}
+ @Override
+ @DS("#header.poolName")
+ public List getOAInfoList(QcCheckUnqualified qcCheckUnqualified) {
+ logger.info("查看流程Id"+ qcCheckUnqualified.getTaskId());
+ AjaxResult oaR = remoteOpenService.GetOaNodeInfo(qcCheckUnqualified.getTaskId());
+ logger.info("流程Id 26235:"+ JSONObject.toJSONString(oaR));
+ List infoList = new ArrayList<>();
+ if((int)oaR.get("code")==200){
+ infoList=JSONArray.parseArray(oaR.get("msg").toString(),OAInfo.class);
+ }
+
+ return infoList;
+ }
+
/*来料检验不良OA流程
* CQ 厂区、 OEMCM 厂名 、 LLLB 来料类别【0、1】、MATNR 物料编号、MAKTX 物料名称、suppliernum 供应商编码
* supplier 供应商名称、CHARG 生产批号、comeQty 来料数量、testDate 检验日期 、 JYBH 检验编号、
@@ -199,14 +215,14 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService
//发起来料检验OA流程
Map paramMap = new HashMap<>();
- paramMap.put("user","999999");//提交人工号qcCheckTaskIncome.getUpdateBy()
+ paramMap.put("user",SecurityUtils.getUsername());//提交人工号qcCheckTaskIncome.getUpdateBy()
paramMap.put("requestLevel",0);//流程紧急度
paramMap.put("requestName","ZL0020-成品检验控制流程");//流程名称
paramMap.put("workflowId",26234);//该流程对应的唯- workFlowld
StringBuffer mainObject = new StringBuffer();
mainObject.append("{");
- mainObject.append("\"SSCJ\":"+detailInfo.getSupplierName());//所属车间
+ mainObject.append("\"SSCJ\":"+"\""+detailInfo.getSupplierName()+"\"");//所属车间
mainObject.append(",\"ZRPSN\":"+"\""+SecurityUtils.getUsername()+"\"");//报检人
mainObject.append(",\"OEM\":"+"\""+detailInfo.getFactoryCode()+"\"");//OEM厂名
mainObject.append(",\"DH\":"+"\""+detailInfo.getOrderNo()+"\"");//单号
@@ -223,19 +239,90 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService
detailObject.append("{\"PRONAME\":\""+detailInfo.getMaterialName()+"\"},");//产品名称
detailObject.append("{\"SCCODE\":\""+detailInfo.getIncomeBatchNo()+"\"},");//批次号
detailObject.append("{\"SCTOTAL\":\""+detailInfo.getQuality()+"\"},");//数量
- detailObject.append("{\"BJDATE\":\""+detailInfo.getCreateTime()+"\"},");//报检日期
+ detailObject.append("{\"BJDATE\":\""+DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",detailInfo.getCreateTime())+"\"},");//报检日期
detailObject.append("{\"JYCODE\":\""+detailInfo.getCheckNo()+"\"},");// 检验编号
- detailObject.append("{\"JYDATE\":\""+detailInfo.getCheckTime()+"\"},");// 检验日期
+ detailObject.append("{\"JYDATE\":\""+DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",detailInfo.getCheckTime())+"\"},");// 检验日期
detailObject.append("{\"JYRESULT\":\""+(detailInfo.getCheckResult().equals("Y")?"0":"2")+"\"},");//检验结果：0合格 2不合格
detailObject.append("{\"CPCYS\":\""+detailInfo.getQuality()+"\"},");// 产品抽样数（PC）
detailObject.append("{\"JYBHGMS\":\""+task.getRemark()+"\"}");// 不合格情况描述
detailObject.append("]}");
- paramMap.put("mainObject",detailObject.toString());
+ paramMap.put("details",detailObject.toString());
logger.info("流程Id 26234:"+ JSONObject.toJSONString(paramMap));
AjaxResult oaR = remoteOpenService.OAInspection(paramMap);
logger.info("流程Id 26234:"+ JSONObject.toJSONString(oaR));
return oaR;
}
+
+ /**
+ {
+ "user": "999999", 提交用户账号
+ "requestLevel": "0", 紧急程度，默认0
+ "requestName": "ZL0030-品质异常流程-智能制造-2024-01-17（产品名称:榄菊高级型蚊香(60装)）",
+ "workflowId": "26256",
+ "mainObject": "{
+ "CPMC":"榄菊高级型蚊香(60装)", *产品名称
+ "CPBM":"10101000115", *产品编码
+ "SQBM":"0", *申请部门 0品质保障部
+ "SQR":"15930", *申请人:默认当前用户 15930：智能制造
+ "SQSJ":"2024-01-17", *申请时间: 默认当前日期
+ "SCCJ":"162", *所属车间 162小榄黑蚊香车间
+ "SCPH":"240555a", *生产批号
+ "SCSL":500, *生产数量
+ "FXDD":"测试地点", *发现地点
+ "FXRQ":"2024-01-17", *发现日期:默认当前日期，可以选择
+ "BH":"202401170002", *编号：流水号 年月日+四位流水号
+ "YCFW":"1", *异常范围：下拉框榄菊所有工厂 1代表小榄工厂
+ "PZYCMS":"测试异常描述", *品质异常描述
+ "Notes":"测试备注", 备注
+ "SFXYZG":"1", *是否需要主管审核 1否 0是
+ "PGZG":"", QC主管：SFXYZG字段为"是",则此项选择QC主管信息
+ "PGZR":"660", *质量主管 660：朱继新
+ "SFGYSWT":"1" *是否供应商问题 1非供应商问题 0是供应商问题
+ }"
+ }
+ * @param task
+ * @return
+ */
+ private AjaxResult createProduceOA(QcCheckUnqualified task){
+
+ QcCheckTaskIncome detailInfo = qcCheckTaskIncomeMapper.getTaskInfo(task.getTaskId());
+ //发起来料检验OA流程
+ Map paramMap = new HashMap<>();
+ paramMap.put("user",SecurityUtils.getUsername());//提交人工号
+ paramMap.put("requestLevel",0);//流程紧急度
+ paramMap.put("requestName","ZL0030-品质异常流程-智能制造-"+DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",detailInfo.getIncomeTime())+"（产品名称:"+detailInfo.getMaterialName()+"）");//流程名称
+ paramMap.put("workflowId",26256);//该流程对应的唯- workFlowld
+
+ StringBuffer mainObject = new StringBuffer();
+ mainObject.append("{");
+ mainObject.append("\"CPMC\":"+detailInfo.getMaterialName());//产品名称
+ mainObject.append(",\"CPBM\":"+detailInfo.getMaterialCode());//产品编码
+ //mainObject.append(",\"SQBM\":"+"\"0\"");//0品质保障部
+ mainObject.append(",\"SQR\":"+"\""+SecurityUtils.getUsername()+"\"");//申请人:默认当前用户
+ mainObject.append(",\"SQSJ\":"+"\""+detailInfo.getSupplierCode()+"\"");//申请时间
+ mainObject.append(",\"SCCJ\":"+"\""+detailInfo.getSupplierName()+"\"");//所属车间
+ mainObject.append(",\"SCPH\":"+"\""+detailInfo.getIncomeBatchNo()+"\"");//生产批号
+ mainObject.append(",\"SCSL\":"+"\""+detailInfo.getQuality()+"\"");//生产数量
+ mainObject.append(",\"FXDD\":"+"\""+detailInfo.getCheckLoc()+"\"");//发现地点
+ mainObject.append(",\"FXRQ\":"+"\""+DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",detailInfo.getCheckTime())+"\"");//发现日期
+ mainObject.append(",\"BH\":"+"\""+detailInfo.getCheckNo()+"\"");//编号：流水号 年月日+四位流水号
+ mainObject.append(",\"YCFW\":"+"\"1\"");//*异常范围：下拉框榄菊所有工厂 1代表小榄工厂
+ mainObject.append(",\"PZYCMS\":"+"\""+detailInfo.getRemark()+"\"");//品质异常描述
+ mainObject.append(",\"Notes\":"+"\"\"");//测试备注
+ mainObject.append(",\"SFXYZG\":"+"\"1\"");//*是否需要主管审核 1否 0是
+ mainObject.append(",\"SFXYZG\":"+"\"1\"");//*是否需要主管审核 1否 0是
+ mainObject.append(",\"PGZG\":"+"\""+detailInfo.getRemark()+"\"");//QC主管：SFXYZG字段为"是",则此项选择QC主管信息
+ mainObject.append(",\"PGZR\":"+"\"660\"");//质量主管 660：朱继新
+ mainObject.append(",\"SFGYSWT\":"+"\"1\"");//*是否供应商问题 1非供应商问题 0是供应商问题
+
+ mainObject.append("}");
+
+ paramMap.put("mainObject",mainObject.toString());
+ logger.info("流程Id 26256:"+ JSONObject.toJSONString(paramMap));
+ AjaxResult oaR = remoteOpenService.OAInspection(paramMap);
+ logger.info("流程Id 26256:"+ JSONObject.toJSONString(oaR));
+ return oaR;
+ }
}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupDetailServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupDetailServiceImpl.java
index cd41c9ec..c7a4d7f8 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupDetailServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupDetailServiceImpl.java
@@ -113,6 +113,7 @@ public class QcMaterialGroupDetailServiceImpl implements IQcMaterialGroupDetailS
}
@Override
+ @DS("#header.poolName")
public boolean validationGroupDetailData(String materialCode) {
return qcMaterialGroupDetailMapper.validationGroupDetailData(materialCode).size() > 0;
}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java
index e01b9448..88661d28 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java
@@ -8,7 +8,10 @@ import java.util.*;
import java.util.stream.Collectors;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.StringUtils;
+import com.op.quality.domain.BaseFile;
+import com.op.quality.domain.QcCheckTaskDetail;
import com.op.quality.domain.QcCheckType;
+import com.op.quality.mapper.QMSFileMapper;
import com.op.system.api.domain.quality.ChartDTO;
import com.op.system.api.domain.quality.ChartSeriesDTO;
import com.op.system.api.domain.quality.FactoryDto;
@@ -29,7 +32,8 @@ import org.springframework.util.CollectionUtils;
public class QcStaticTableServiceImpl implements IQcStaticTableService {
@Autowired
private QcStaticTableMapper qcStaticTableMapper;
-
+ @Autowired
+ private QMSFileMapper qmsFileMapper;
/**
* 查询质量系统报列表
*
@@ -172,96 +176,192 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
private void getDataFromMap(Map detailMap,QcStaticTable project){
String keystr = project.getProjectId()+"08";
QcStaticTable detail = detailMap.get(keystr);
- if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
- project.setColumn080090(detail.getStatus());
+ if(detail!=null&&StringUtils.isNotBlank(detail.getRemark())){
+ project.setColumn080090(detail.getRemark());
+ List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
+ if (!CollectionUtils.isEmpty(files)) {
+ List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
+ String picurls = pics.stream().collect(Collectors.joining(","));
+ project.setColumn080090(project.getColumn080090()+","+picurls);
+ }
+ }else if(detail!=null&&StringUtils.isNotBlank(detail.getStatus())){
+ project.setColumn080090(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn080090("-");
}
keystr = project.getProjectId()+"09";
detail = detailMap.get(keystr);
- if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
- project.setColumn090100(detail.getStatus());
+ if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
+ project.setColumn090100(detail.getRemark());
+ List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
+ if (!CollectionUtils.isEmpty(files)) {
+ List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
+ String picurls = pics.stream().collect(Collectors.joining(","));
+ project.setColumn090100(project.getColumn090100()+","+picurls);
+ }
+ }else if(detail!=null&&StringUtils.isNotBlank(detail.getStatus())){
+ project.setColumn090100(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn090100("-");
}
keystr = project.getProjectId()+"10";
detail = detailMap.get(keystr);
- if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
- project.setColumn100110(detail.getStatus());
+ if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
+ project.setColumn100110(detail.getRemark());
+ List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
+ if (!CollectionUtils.isEmpty(files)) {
+ List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
+ String picurls = pics.stream().collect(Collectors.joining(","));
+ project.setColumn100110(project.getColumn100110()+","+picurls);
+ }
+ }else if(detail!=null&&StringUtils.isNotBlank(detail.getStatus())){
+ project.setColumn100110(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn100110("-");
}
keystr = project.getProjectId()+"11";
detail = detailMap.get(keystr);
- if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
- project.setColumn110120(detail.getStatus());
+ if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
+ project.setColumn110120(detail.getRemark());
+ List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
+ if (!CollectionUtils.isEmpty(files)) {
+ List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
+ String picurls = pics.stream().collect(Collectors.joining(","));
+ project.setColumn110120(project.getColumn110120()+","+picurls);
+ }
+ }else if(detail!=null&&detail!=null && StringUtils.isNotBlank(detail.getStatus())){
+ project.setColumn110120(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn110120("-");
}
keystr = project.getProjectId()+"12";
detail = detailMap.get(keystr);
- if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
- project.setColumn123133(detail.getStatus());
+ if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
+ project.setColumn123133(detail.getRemark());
+ List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
+ if (!CollectionUtils.isEmpty(files)) {
+ List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
+ String picurls = pics.stream().collect(Collectors.joining(","));
+ project.setColumn123133(project.getColumn123133()+","+picurls);
+ }
+ }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
+ project.setColumn123133(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn123133("-");
}
keystr = project.getProjectId()+"13";
detail = detailMap.get(keystr);
- if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
- project.setColumn133143(detail.getStatus());
+ if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
+ project.setColumn133143(detail.getRemark());
+ List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
+ if (!CollectionUtils.isEmpty(files)) {
+ List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
+ String picurls = pics.stream().collect(Collectors.joining(","));
+ project.setColumn133143(project.getColumn133143()+","+picurls);
+ }
+ }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
+ project.setColumn133143(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn133143("-");
}
keystr = project.getProjectId()+"14";
detail = detailMap.get(keystr);
- if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
- project.setColumn143153(detail.getStatus());
+ if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
+ project.setColumn143153(detail.getRemark());
+ List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
+ if (!CollectionUtils.isEmpty(files)) {
+ List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
+ String picurls = pics.stream().collect(Collectors.joining(","));
+ project.setColumn143153(project.getColumn143153()+","+picurls);
+ }
+ }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
+ project.setColumn143153(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn143153("-");
}
keystr = project.getProjectId()+"15";
detail = detailMap.get(keystr);
- if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
- project.setColumn153163(detail.getStatus());
+ if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
+ project.setColumn153163(detail.getRemark());
+ List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
+ if (!CollectionUtils.isEmpty(files)) {
+ List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
+ String picurls = pics.stream().collect(Collectors.joining(","));
+ project.setColumn153163(project.getColumn153163()+","+picurls);
+ }
+ }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
+ project.setColumn153163(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn153163("-");
}
keystr = project.getProjectId()+"16";
detail = detailMap.get(keystr);
- if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
- project.setColumn163173(detail.getStatus());
+ if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
+ project.setColumn163173(detail.getRemark());
+ List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
+ if (!CollectionUtils.isEmpty(files)) {
+ List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
+ String picurls = pics.stream().collect(Collectors.joining(","));
+ project.setColumn163173(project.getColumn163173()+","+picurls);
+ }
+ }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
+ project.setColumn163173(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn163173("-");
}
keystr = project.getProjectId()+"18";
detail = detailMap.get(keystr);
- if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
- project.setColumn180190(detail.getStatus());
+ if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
+ project.setColumn180190(detail.getRemark());
+ List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
+ if (!CollectionUtils.isEmpty(files)) {
+ List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
+ String picurls = pics.stream().collect(Collectors.joining(","));
+ project.setColumn180190(project.getColumn180190()+","+picurls);
+ }
+ }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
+ project.setColumn180190(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn180190("-");
}
keystr = project.getProjectId()+"19";
detail = detailMap.get(keystr);
- if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
- project.setColumn190200(detail.getStatus());
+ if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
+ project.setColumn190200(detail.getRemark());
+ List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
+ if (!CollectionUtils.isEmpty(files)) {
+ List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
+ String picurls = pics.stream().collect(Collectors.joining(","));
+ project.setColumn190200(project.getColumn190200()+","+picurls);
+ }
+ }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
+ project.setColumn190200(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn190200("-");
}
keystr = project.getProjectId()+"20";
detail = detailMap.get(keystr);
- if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
- project.setColumn200210(detail.getStatus());
+ if(detail!=null && StringUtils.isNotBlank(detail.getRemark())){
+ project.setColumn200210(detail.getRemark());
+ List files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
+ if (!CollectionUtils.isEmpty(files)) {
+ List pics = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
+ String picurls = pics.stream().collect(Collectors.joining(","));
+ project.setColumn200210(project.getColumn200210()+","+picurls);
+ }
+ }else if(detail!=null && StringUtils.isNotBlank(detail.getStatus())){
+ project.setColumn200210(detail.getStatus().equals("Y")?"✓":"✘");
}else{
project.setColumn200210("-");
}
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml
index 0895a836..10a5874f 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml
@@ -36,14 +36,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
+
select record_id, check_no, income_batch_no, order_no, material_code, material_name, quality, unit,
supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code, check_man_name,sample_quality,
check_time, check_result, status, check_type, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time,
- factory_code, del_flag from qc_check_task
+ factory_code, del_flag,reason,product_type
+ from qc_check_task
-
-
+
+
+
+
insert into qc_check_task
record_id,
@@ -263,8 +314,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where record_id = #{recordId}
+
+ update qc_check_task
+ set confirm = #{confirm},
+ confirm_man_code = #{confirmManCode},
+ confirm_man_name = #{confirmManName},
+ confirm_remark = #{confirmRemark},
+ confirm_time = #{confirmTime}
+
+
+ and record_id = #{recordId}
+
+
+ and order_no = #{orderNo}
+
+
+
-
+
delete from qc_check_task where record_id = #{recordId}
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDetailMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDetailMapper.xml
index 9b3b4783..90388610 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDetailMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDetailMapper.xml
@@ -54,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and attr3 = #{attr3}
and attr4 = #{attr4}
and factory_code = #{factoryCode}
+ and del_flag = '0'
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
index 6b657b7d..49734a0d 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
@@ -35,13 +35,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
select record_id, check_no, income_batch_no, order_no, material_code, material_name, quality, unit,
supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code,
check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by,
- create_time, update_by, update_time, factory_code, del_flag , check_type,noOk_quality
+ create_time, update_by, update_time, factory_code, del_flag , check_type,sample_quality, noOk_quality
from qc_check_task
@@ -51,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status,
qct.check_man_code, qct.check_man_name,qct.check_time, qct.check_result, qct.status,
qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type,qct.noOk_quality,
- qct.type_code
+ qct.sample_quality, qct.type_code
from qc_check_task qct
and qct.check_no = #{checkNo}
@@ -310,6 +311,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{recordId}
+
+ delete from qc_check_task_defect where belong_to = #{belongId}
+
+
-
+
insert into qc_check_task_user(
record_id,belong_to,check_no,
check_man_code,check_man_name,
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml
index 61b02ebd..824b38a1 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml
@@ -37,7 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
+
@@ -73,6 +74,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
+
@@ -81,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
check_man_code, check_man_name, check_time, check_result, status, attr1,
attr2, attr3, attr4, create_by, create_time, update_by, update_time,
factory_code, del_flag , check_type,sample_quality,noOk_quality,
- aNoOkquality,bNoOkquality,cNoOkquality
+ aNoOkquality,bNoOkquality,cNoOkquality,reason,product_type
from qc_check_task
@@ -205,6 +210,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
del_flag,
check_type,
type_code,
+ reason,
+ product_type,
+ confirm_man_code,
+ confirm_man_name,
#{recordId},
@@ -242,6 +251,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{delFlag},
#{checkType},
#{typeCode},
+ #{reason},
+ #{productType},
+ #{confirmManCode},
+ #{confirmManName},
@@ -280,6 +293,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_time = #{updateTime},
factory_code = #{factoryCode},
del_flag = #{delFlag},
+ reason = #{reason},
+ product_type = #{productType},
+ confirm_man_code = #{confirmManCode},
+ confirm_man_name = #{confirmManName},
where record_id = #{recordId}
@@ -307,7 +324,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit,
qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status,
qct.check_time, qct.check_result, qct.check_type,'首件检验' check_name,
- CONVERT(varchar(10),qct.create_time, 120) createTimeStr
+ CONVERT(varchar(10),qct.create_time, 120) createTimeStr,
+ qct.confirm,qct.confirm_man_name
from qc_check_task qct
and qct.check_no = #{checkNo}
@@ -333,7 +351,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
'','','',
qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit,
qct.supplier_code, qct.supplier_name, qct.income_time,'','',
- '','', qct.check_type,'巡检检验' check_name,CONVERT(varchar(10),qct.create_time, 120) createTimeStr
+ '','', qct.check_type,'巡检检验' check_name,CONVERT(varchar(10),qct.create_time, 120) createTimeStr,
+ qct.confirm,qct.confirm_man_name
from qc_check_task qct
and qct.check_no = #{checkNo}
@@ -355,7 +374,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and qct.check_type = 'checkTypeSCXJ'
GROUP BY qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit,
- qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_type,CONVERT(varchar(10),qct.create_time, 120)
+ qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_type,CONVERT(varchar(10),qct.create_time, 120),
+ qct.confirm,qct.confirm_man_name
) t
where 1=1
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml
index 9d16ea66..5614c804 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml
@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -41,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
material_name, quality, unit, supplier_code, supplier_name,
income_time, check_loc, check_status, check_man_code, check_man_name,
check_time, check_result, status, create_by,
- create_time, update_by, update_time, check_type
+ create_time, update_by, update_time, check_type, sample_quality, noOk_quality
from qc_check_task
@@ -50,8 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit,
qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status,
qct.check_man_code, qct.check_man_name,qct.check_time, qct.check_result, qct.status,
- qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type,
- q.type_code
+ qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type, qct.sample_quality,
+ qct.noOk_quality, q.type_code
from qc_check_task qct
left join qc_check_type q on q.id = qct.check_type
@@ -202,9 +203,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
del_flag = #{delFlag},
sample_quality = #{sampleQuality},
noOk_quality = #{noOkQuality},
- aNoOkquality = #{aNoOkquality},
- bNoOkquality = #{bNoOkquality},
- cNoOkquality = #{cNoOkquality},
where record_id = #{recordId}
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml
index 160e1635..c19a7dd3 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckUnqualifiedMapper.xml
@@ -31,8 +31,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+