From d2d18ee1d1a69e4c31d6557b56af9b4289de43d5 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 8 Aug 2024 23:31:29 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/ProOrderWorkorderServiceImpl.java | 4 +++-
.../QcCheckReportIncomeController.java | 18 +++++++++---------
.../op/quality/domain/QcCheckTaskIncome.java | 9 +++++++++
.../op/quality/domain/QcCheckTaskProduce.java | 9 +++++++++
.../mapper/QcCheckReportIncomeMapper.java | 2 ++
.../impl/QcCheckReportIncomeServiceImpl.java | 4 ++++
.../impl/QcCheckReportProduceServiceImpl.java | 5 +++++
.../impl/QcCheckTaskIncomeServiceImpl.java | 2 +-
.../quality/QcCheckReportIncomeMapper.xml | 9 +++++++++
.../mapper/quality/QcCheckTaskIncomeMapper.xml | 2 +-
10 files changed, 52 insertions(+), 12 deletions(-)
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 8afbe552..41f1b24f 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
@@ -1304,7 +1304,9 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
}
}
}
- proOrderWorkorderMapper.addBatchPallet(dtos);
+ if(!CollectionUtils.isEmpty(dtos)){
+ proOrderWorkorderMapper.addBatchPallet(dtos);
+ }
}else{
dtos.addAll(dtos0);
}
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java
index 4ca41345..7516fb5c 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java
@@ -40,15 +40,15 @@ public class QcCheckReportIncomeController 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) + " 23:59:59";
- 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) + " 23:59:59";
+// qcCheckReportIncome.setCheckTimeEnd(dateEndStr);//end
+// }
// if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){
// qcCheckReportIncome.setCheckTimeStart(qcCheckReportIncome.getIncomeTimeStart());//start
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 4d678ccc..f6b7da61 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
@@ -215,6 +215,15 @@ public class QcCheckTaskIncome extends BaseEntity {
private String pgzr;//质量主管
private String oaFactoryF;//异常范围
private String sccj;
+ private String bz;
+
+ public String getBz() {
+ return bz;
+ }
+
+ public void setBz(String bz) {
+ this.bz = bz;
+ }
public String getSccj() {
return sccj;
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 acbc55e5..ba1a88d6 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
@@ -206,6 +206,15 @@ public class QcCheckTaskProduce extends BaseEntity {
private String confirmRemark;
private String confirmTime;
private String shiftId;
+ private String bz;//备注
+
+ public String getBz() {
+ return bz;
+ }
+
+ public void setBz(String bz) {
+ this.bz = bz;
+ }
public String getShiftId() {
return shiftId;
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 8f8612cb..b8ac67e2 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
@@ -85,4 +85,6 @@ public interface QcCheckReportIncomeMapper {
List<QcCheckTaskProduce> getLastProductTypeInfo(QcCheckTaskProduce qcCheckTaskProduce);
List<String> getBatchsByTaskId(String recordId);
+
+ QcCheckTaskProduce getLastXJ(QcCheckTaskProduce qcCheckTaskProduce);
}
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 27e55801..b52ca5b1 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
@@ -197,6 +197,10 @@ public class QcCheckReportIncomeServiceImpl implements IQcCheckReportIncomeServi
public List<QcCheckTaskDetail> getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail) {
List<QcCheckTaskDetail> dtos = qcCheckReportIncomeMapper.getCkeckProjectList(qcCheckTaskDetail);
for (QcCheckTaskDetail dto : dtos) {
+ if(StringUtils.isNotBlank(dto.getSamplePlan())){
+ dto.setSamplePlan(dto.getSamplePlan().replace(".00",""));
+ }
+
List<BaseFile> files = qmsFileMapper.getBaseFileBatch(dto.getRecordId());
if (!CollectionUtils.isEmpty(files)) {
dto.setFiles(files);
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 6dfb5cd8..977a8a41 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
@@ -221,6 +221,11 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer
qcStaticTable.setShiftId(qcCheckTaskProduce.getShiftId());
List<QcStaticTable> checkInfos = qcStaticTableService.getXJCheckTableDetail(qcStaticTable);
produce.setCheckInfos(checkInfos);
+ QcCheckTaskProduce lastXJ = qcCheckReportIncomeMapper.getLastXJ(qcCheckTaskProduce);
+ if(lastXJ!=null){
+ produce.setBz(lastXJ.getBz());
+ }
+
List<QcCheckTaskProduce> lastProduces = qcCheckReportIncomeMapper.getLastProductTypeInfo(qcCheckTaskProduce);
if (!CollectionUtils.isEmpty(lastProduces)) {
produce.setProductType(lastProduces.get(0).getProductType());
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 6a7e1cbb..6b471a58 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
@@ -689,7 +689,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
qcCheckTask.setCheckManName(qcCheckTaskIncome.getUpdateByName());
qcCheckTask.setSampleQuality(qcCheckTaskIncome.getSampleQuality());
qcCheckTask.setReason(qcCheckTaskIncome.getReason());
- qcCheckTask.setAttr3(qcCheckTaskIncome.getAttr3());
+ qcCheckTask.setBz(qcCheckTaskIncome.getAttr3());//备注
/**qc_check_task**/
n = qcCheckTaskIncomeMapper.updateQcCheckTask(qcCheckTask);
logger.info("qc_check_task:"+n);
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 2738f0b1..7229c15c 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
@@ -263,6 +263,15 @@
where qct.record_id = #{recordId}
order by powb.batch_code
</select>
+ <select id="getLastXJ" resultType="com.op.quality.domain.QcCheckTaskProduce">
+ SELECT
+ top 1 c.bz
+ FROM
+ qc_check_task c
+ where c.check_type='checkTypeSCXJ' and c.order_no = #{orderNo}
+ and c.bz is not null
+ order by c.create_time desc
+ </select>
<insert id="insertQcCheckReportIncome" parameterType="QcCheckReportIncome">
insert into qc_check_task
<trim prefix="(" suffix=")" suffixOverrides=",">
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 d72e0e31..a363ca2d 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
@@ -314,7 +314,7 @@
<if test="incomeBatchNo != null">income_batch_no = #{incomeBatchNo},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="reason != null">reason = #{reason},</if>
- <if test="attr3 != null">attr3 = #{attr3},</if>
+ <if test="bz != null">bz = #{bz},</if>
check_result = #{checkResult},
update_by = #{updateBy},
update_time = #{updateTime}
From 74ef5ea97a854a09dacadd91eafc725348605e38 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 9 Aug 2024 11:59:15 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=89=8B=E7=B2=97=E8=8D=89=E7=A8=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../op-common-datascope.iml | 5 +-
op-common/op-common-log/op-common-log.iml | 5 +-
.../op-common-security/op-common-security.iml | 5 +-
.../impl/MesReportWorkConsumeServiceImpl.java | 9 +-
.../QcCheckReportIncomeController.java | 18 +--
.../QcCheckReportProductController.java | 18 +--
.../op/quality/controller/QuaController.java | 14 ++
.../service/IQcCheckTaskIncomeService.java | 2 +
.../impl/QcCheckTaskIncomeServiceImpl.java | 127 +++++++++++++++++-
9 files changed, 168 insertions(+), 35 deletions(-)
diff --git a/op-common/op-common-datascope/op-common-datascope.iml b/op-common/op-common-datascope/op-common-datascope.iml
index 3df02a46..dab4c8af 100644
--- a/op-common/op-common-datascope/op-common-datascope.iml
+++ b/op-common/op-common-datascope/op-common-datascope.iml
@@ -21,6 +21,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="op-api-system" />
<orderEntry type="module" module-name="op-common-security" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.24" level="project" />
@@ -30,7 +31,7 @@
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.24" level="project" />
- <orderEntry type="module" module-name="op-api-system" />
+ <orderEntry type="library" name="Maven: com.op:op-api-system:0.0.1" level="project" />
<orderEntry type="module" module-name="op-common-core" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:3.1.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.1.5" level="project" />
@@ -125,4 +126,4 @@
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.69" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcutil-jdk15on:1.69" level="project" />
</component>
-</module>
\ No newline at end of file
+</module>
diff --git a/op-common/op-common-log/op-common-log.iml b/op-common/op-common-log/op-common-log.iml
index 3df02a46..dab4c8af 100644
--- a/op-common/op-common-log/op-common-log.iml
+++ b/op-common/op-common-log/op-common-log.iml
@@ -21,6 +21,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="op-api-system" />
<orderEntry type="module" module-name="op-common-security" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.24" level="project" />
@@ -30,7 +31,7 @@
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.24" level="project" />
- <orderEntry type="module" module-name="op-api-system" />
+ <orderEntry type="library" name="Maven: com.op:op-api-system:0.0.1" level="project" />
<orderEntry type="module" module-name="op-common-core" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:3.1.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.1.5" level="project" />
@@ -125,4 +126,4 @@
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.69" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcutil-jdk15on:1.69" level="project" />
</component>
-</module>
\ No newline at end of file
+</module>
diff --git a/op-common/op-common-security/op-common-security.iml b/op-common/op-common-security/op-common-security.iml
index 5f28b4a0..5422c64f 100644
--- a/op-common/op-common-security/op-common-security.iml
+++ b/op-common/op-common-security/op-common-security.iml
@@ -21,6 +21,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="op-api-system" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.24" level="project" />
@@ -29,7 +30,7 @@
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.24" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.24" level="project" />
- <orderEntry type="module" module-name="op-api-system" />
+ <orderEntry type="library" name="Maven: com.op:op-api-system:0.0.1" level="project" />
<orderEntry type="module" module-name="op-common-core" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:3.1.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.1.5" level="project" />
@@ -124,4 +125,4 @@
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.69" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcutil-jdk15on:1.69" level="project" />
</component>
-</module>
\ No newline at end of file
+</module>
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java
index 8d49d1a7..94571128 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java
@@ -170,7 +170,7 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer
@Override
@DS("#header.poolName")
- @Transactional(rollbackFor = IllegalArgumentException.class)
+ //@Transactional(rollbackFor = IllegalArgumentException.class)
public int submitConsumePS(List<MesReportWorkConsume> mesReportWorkConsumes) {
//根据belong_work_order找到sap工单(子子母)
@@ -249,9 +249,10 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer
logger.info(workorder.getWorkorderCode()
+ "报工损耗物料组件修改请求：" + JSONObject.toJSONString(mapList));
- R bomUpdateR = remoteSapService.shopOrderBomUpdate(mapList);
- logger.info(workorder.getWorkorderCode()
- + "报工损耗物料组件修改结果：" + JSONObject.toJSONString(bomUpdateR));
+ R bomUpdateR = R.ok();//
+// R bomUpdateR = remoteSapService.shopOrderBomUpdate(mapList);
+// logger.info(workorder.getWorkorderCode()
+// + "报工损耗物料组件修改结果：" + JSONObject.toJSONString(bomUpdateR));
if(bomUpdateR.getCode() == 200){
//attr2 0->1组件完成修改
int f = mesReportWorkMapper.updateAttr2(workorder);
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java
index 7516fb5c..74325722 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportIncomeController.java
@@ -68,15 +68,15 @@ public class QcCheckReportIncomeController 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
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java
index d93a13a3..0813b453 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java
@@ -71,15 +71,15 @@ public class QcCheckReportProductController 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
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java
index f3a49d2d..c81f2d18 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java
@@ -225,6 +225,20 @@ public class QuaController extends BaseController {
}
return toAjax(qcCheckTaskIncomeService.commitCheckResults(qcCheckTaskIncome));
}
+ @PostMapping(value = "commitCheckResultsCg")
+ public AjaxResult commitCheckResultsCg(@RequestBody QcCheckTaskIncome qcCheckTaskIncome) {
+ DynamicDataSourceContextHolder.push(qcCheckTaskIncome.getFactoryCode());
+// if(CollectionUtils.isEmpty(qcCheckTaskIncome.getQcCheckTaskDetails())){
+// return error("[List<QcCheckTaskDetail>]不能为空");
+// }
+ if(StringUtils.isBlank(qcCheckTaskIncome.getUpdateBy())){
+ return error("[updateBy]不能为空");
+ }
+ if(StringUtils.isBlank(qcCheckTaskIncome.getUpdateByName())){
+ return error("[updateByName]不能为空");
+ }
+ return toAjax(qcCheckTaskIncomeService.commitCheckResultsCg(qcCheckTaskIncome));
+ }
@PostMapping(value = "getUserIdList")
public List<SysUser> getUserIdList(@RequestBody SysUser sysUser) {
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 0f0487bf..c121d5b5 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
@@ -109,4 +109,6 @@ public interface IQcCheckTaskIncomeService {
List<SysUser> getUserIdList(SysUser sysUser);
SysUser getOaUserId(SysUser sysUser);
+
+ int commitCheckResultsCg(QcCheckTaskIncome qcCheckTaskIncome);
}
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 6b471a58..bc79d244 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
@@ -642,8 +642,8 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
@Override
//@Transactional(rollbackFor = Exception.class)
- public int commitCheckResults(QcCheckTaskIncome qcCheckTaskIncome) {
- logger.info("质检提交参数："+JSONObject.toJSONString(qcCheckTaskIncome));
+ public int commitCheckResultsCg(QcCheckTaskIncome qcCheckTaskIncome) {
+ logger.info("草稿质检提交参数："+JSONObject.toJSONString(qcCheckTaskIncome));
List<QcCheckTaskDetail> details = qcCheckTaskIncome.getQcCheckTaskDetails();
Date nowTime = DateUtils.getNowDate();
@@ -668,6 +668,118 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
result = qcCheckTaskIncome.getCheckResult();
}
+ int n = 0;
+ QcCheckTaskIncome qcCheckTask = new QcCheckTaskIncome();
+ //qcCheckTask.setSampleQuality(sampleQua);
+ qcCheckTask.setUpdateBy(updateBy);
+ qcCheckTask.setRecordId(belongId);
+ qcCheckTask.setCheckStatus("2");//检测状态0待检测1检测中2检测完成
+ qcCheckTask.setUpdateTime(nowTime);
+ qcCheckTask.setCheckTime(nowTime);
+ qcCheckTask.setRemark(qcCheckTaskIncome.getRemark());
+ qcCheckTask.setCheckResult(result);//检验结果Y合格 N不合格
+ qcCheckTask.setIncomeBatchNo(qcCheckTaskIncome.getIncomeBatchNo());
+ BigDecimal noOkQquality = new BigDecimal("0");
+ List<QcCheckTaskDefect> defects0 = qcCheckTaskIncome.getDefects();
+ for(QcCheckTaskDefect defect0:defects0){
+ noOkQquality = noOkQquality.add(defect0.getNoOkQuality());
+ }
+ qcCheckTask.setNoOkQuality(noOkQquality);//累计不合格数
+ qcCheckTask.setCheckManCode(qcCheckTaskIncome.getUpdateBy());
+ qcCheckTask.setCheckManName(qcCheckTaskIncome.getUpdateByName());
+ qcCheckTask.setSampleQuality(qcCheckTaskIncome.getSampleQuality());
+ qcCheckTask.setReason(qcCheckTaskIncome.getReason());
+ qcCheckTask.setBz(qcCheckTaskIncome.getAttr3());//备注
+ /**qc_check_task_cg**/
+ n = qcCheckTaskIncomeMapper.updateQcCheckTask(qcCheckTask);//updateQcCheckTaskCG
+ logger.info("qc_check_task:"+n);
+ /**更新qc_check_task_detail**/
+ for(QcCheckTaskDetail detail:details){
+ detail.setUpdateTime(nowTime);
+ //上传附件
+ if (StringUtils.isNotEmpty(detail.getFileListStr())) {
+ String[] ids = detail.getFileListStr().split(",");
+ List<BaseFileData> files = new ArrayList<>();
+ BaseFileData file = null;
+ for (String id : ids) {
+ file = new BaseFileData();
+ file.setFileId(IdUtils.fastSimpleUUID());
+ file.setFileName(id.split("&fileName=")[1]);
+ file.setFileAddress(id);
+ file.setSourceId(detail.getRecordId());
+ file.setCreateBy(SecurityUtils.getUsername());
+ file.setCreateTime(nowTime);
+ files.add(file);
+ }
+ /**base_file**/
+ n = qmsFileMapper.insertBaseFileBatch(files);
+ System.out.println("base_file:"+n);
+ }
+
+ }
+ n= qcCheckTaskIncomeMapper.updateQcCheckTaskDetails(details);
+ logger.info("更新qc_check_task_detail:"+n);
+
+ /**qc_check_task_defect**/
+ n=qcCheckTaskIncomeMapper.deleteQcCheckTaskDefects(belongId);
+ logger.info("清理qc_check_task_defect:"+n);
+ List<QcCheckTaskDefect> defects = new ArrayList<>();
+ QcCheckTaskDefect defect = null;
+ for(QcCheckTaskDetail detail:details){
+ if(StringUtils.isNotBlank(detail.getDefectCodes())){
+ String[] defectCodes = detail.getDefectCodes().split(",");
+ String[] defectNames = detail.getDefectNames().split(",");
+ String[] defectQualitys = detail.getDefectQualitys().split(",");
+ for(int d=0;d<defectCodes.length;d++){
+ defect = new QcCheckTaskDefect();
+ defect.setDefectCode(defectCodes[d]);
+ defect.setDefectSubclass(defectNames[d].split(":")[0]);
+ defect.setNoOkQuality(new BigDecimal(defectQualitys[d]));
+ defect.setRecordId(IdUtils.fastSimpleUUID());
+ defect.setCreateTime(nowTime);
+ defect.setCreateBy(updateBy);
+ defect.setFactoryCode(factoryCode);
+ defect.setBelongTo(belongId);
+ defect.setBelongToDetail(detail.getRecordId());
+ defects.add(defect);
+ }
+ }
+ }
+ if(!CollectionUtils.isEmpty(defects)){
+ n= qcCheckTaskIncomeMapper.addQcCheckTaskDefects(defects);
+ logger.info("qc_check_task_defect:"+n);
+ }
+ return 1 ;
+ }
+
+ @Override
+ //@Transactional(rollbackFor = Exception.class)
+ public int commitCheckResults(QcCheckTaskIncome qcCheckTaskIncome) {
+ logger.info("质检提交参数："+JSONObject.toJSONString(qcCheckTaskIncome));
+ List<QcCheckTaskDetail> details = qcCheckTaskIncome.getQcCheckTaskDetails();
+
+ Date nowTime = DateUtils.getNowDate();
+ String factoryCode = qcCheckTaskIncome.getFactoryCode();
+ String updateBy = qcCheckTaskIncome.getUpdateBy();
+ String belongId = details.get(0).getBelongTo();
+ String checkType = qcCheckTaskIncome.getCheckType();
+ qcCheckTaskIncome.setFactoryCode(qcCheckTaskIncome.getFactoryCode().replace("ds_",""));
+ //默认合格
+
+ String result=null;
+ if(StringUtils.isBlank(qcCheckTaskIncome.getCheckResult())){
+ result = "Y";
+ for(QcCheckTaskDetail detail:details){
+ if("N".equals(detail.getStatus())){
+ result = "N";//不合格
+ break;
+ }
+ }
+ }else{
+ //有最终判定的情况
+ result = qcCheckTaskIncome.getCheckResult();
+ }
+
int n = 0;
QcCheckTaskIncome qcCheckTask = new QcCheckTaskIncome();
//qcCheckTask.setSampleQuality(sampleQua);
@@ -784,7 +896,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
}
}else if("product".equals(qcCheckTaskIncome.getTypeCode())){
- /**wms_product_put-->check_status->1**/
+ /**wms_product_put-->check_status->1**/
qcCheckTaskIncome.setStatus("2");
qcCheckUnqualifiedMapper.updatePutStatus(qcCheckTaskIncome);
}
@@ -800,14 +912,15 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
unqualified.setType(checkType);
n = qcCheckUnqualifiedMapper.insertQcCheckUnqualified(unqualified);
logger.info("qc_check_unqualified:" + n);
- if("1".equals(qcCheckTaskIncome.getStartOA())){
- this.setOaFunc(unqualified,qcCheckTaskIncome);
+ if("1".equals(qcCheckTaskIncome.getStartOA())){
+ this.setOaFunc(unqualified,qcCheckTaskIncome);
}
- //发送企业微信
- this.sendWX(qcCheckTaskIncome);
+ //发送企业微信
+ this.sendWX(qcCheckTaskIncome);
}
return 1 ;
}
+
/* 首检巡检都是品质异常流程
* 成品的是成品检验控制流程
* 来料的是来料检验不合格流程*/
From eb182893b9eb0a5443907e55c9b1cbe80acc115a Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 9 Aug 2024 12:18:25 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/mes/MesReportWorkMapper.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 de9e6664..68509b2b 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
@@ -830,7 +830,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mrwc.warehouse_code warehouseCode
from mes_report_work_consume mrwc
left join pro_order_workorder pow on mrwc.workorder_code = pow.workorder_code
- where mrwc.attr1 = '1' and mrwc.del_flag = '0' and mrwc.attr2 = '0'
+ where mrwc.attr1 = '1' and mrwc.del_flag = '0' and mrwc.attr2 = '0' and pow.del_flag = '0'
and mrwc.parent_order = #{workorderCode}
</select>
<select id="getReportRate" resultType="java.math.BigDecimal">
From bb08a4a2abcc7291cd1b600004a2b5b087652d83 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 9 Aug 2024 12:19:16 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E7=BB=84=E4=BB=B62?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mes/service/impl/MesReportWorkConsumeServiceImpl.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java
index 94571128..a2ac69f8 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java
@@ -249,10 +249,9 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer
logger.info(workorder.getWorkorderCode()
+ "报工损耗物料组件修改请求：" + JSONObject.toJSONString(mapList));
- R bomUpdateR = R.ok();//
-// R bomUpdateR = remoteSapService.shopOrderBomUpdate(mapList);
-// logger.info(workorder.getWorkorderCode()
-// + "报工损耗物料组件修改结果：" + JSONObject.toJSONString(bomUpdateR));
+ R bomUpdateR = remoteSapService.shopOrderBomUpdate(mapList);
+ logger.info(workorder.getWorkorderCode()
+ + "报工损耗物料组件修改结果：" + JSONObject.toJSONString(bomUpdateR));
if(bomUpdateR.getCode() == 200){
//attr2 0->1组件完成修改
int f = mesReportWorkMapper.updateAttr2(workorder);
From c62b724af5dc57b02db4209060811ca33b6cb719 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 9 Aug 2024 12:20:13 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E7=BB=84=E4=BB=B63?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../op/mes/service/impl/MesReportWorkConsumeServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java
index a2ac69f8..8d49d1a7 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java
@@ -170,7 +170,7 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer
@Override
@DS("#header.poolName")
- //@Transactional(rollbackFor = IllegalArgumentException.class)
+ @Transactional(rollbackFor = IllegalArgumentException.class)
public int submitConsumePS(List<MesReportWorkConsume> mesReportWorkConsumes) {
//根据belong_work_order找到sap工单(子子母)