From 973022f0585dbada665543db56e64e1ce3816150 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期四, 04 七月 2024 16:01:27 +0800
Subject: [PATCH] 添加测试品检接口
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceProductionLog.java | 2
pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml | 18 ++--
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java | 16 ++++
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml | 18 ++--
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/util/DeviceStatus.java | 36 +++++++++
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java | 6
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml | 18 ++--
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/QueryVo.java | 2
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLife.java | 4
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 103 ++++++++++++++++---------
10 files changed, 151 insertions(+), 72 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java
index 36e1b70..ece7a09 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java
@@ -65,7 +65,7 @@
*/
public String equipCycleContent;
/**
- * 鐘舵��: 1:缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾
+ * 鐘舵��: 1:缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾,5:娴嬭瘯涓嶉�氳繃,6:鍝佹涓嶉�氳繃
*/
public Integer status;
/**
@@ -73,9 +73,9 @@
*/
public Integer result;
/**
- * 缁翠慨鑺傜偣杩斿洖鐨勯敊璇爜
+ * 缁翠慨鑺傜偣杩斿洖鐨勯敊璇俊鎭�
*/
- public String errorCode;
+ public String errorMsg;
/**
* 杈呭姪浜哄憳:杈呭姪鍛樺伐id,浠ラ�楀彿闅斿紑
*/
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLife.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLife.java
index 4d2a8f4..d560b5e 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLife.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLife.java
@@ -74,9 +74,9 @@
*/
public Integer result;
/**
- * 缁翠慨鑺傜偣杩斿洖鐨勯敊璇爜
+ * 缁翠慨鑺傜偣杩斿洖鐨勯敊淇℃伅
*/
- public String errorCode;
+ public String errorMsg;
/**
* 杈呭姪浜哄憳:杈呭姪鍛樺伐id,浠ラ�楀彿闅斿紑
*/
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceProductionLog.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceProductionLog.java
index 89e9356..26b9d94 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceProductionLog.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceProductionLog.java
@@ -75,7 +75,7 @@
/**
*
*/
- public String errorCode;
+ public String errorMsg;
/**
* 杈呭姪浜哄憳:杈呭姪鍛樺伐id,浠ラ�楀彿闅斿紑
*/
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/util/DeviceStatus.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/util/DeviceStatus.java
new file mode 100644
index 0000000..347427b
--- /dev/null
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/util/DeviceStatus.java
@@ -0,0 +1,36 @@
+package com.dy.pmsGlobal.util;
+
+public enum DeviceStatus {
+ ASSEMBLING(1, "缁勮涓�"),
+ COMPLETED(2, "瀹屾垚"),
+ REPAIR(3, "缁翠慨"),
+ WASTE(4, "鎶ュ簾"),
+ TEST_FAILED(5, "娴嬭瘯涓嶉�氳繃"),
+ INSPECTION_FAILED(6, "鍝佹涓嶉�氳繃");
+
+ private final int code;
+ private final String description;
+
+ DeviceStatus(int code, String description) {
+ this.code = code;
+ this.description = description;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ // 鏍规嵁code鍊艰幏鍙栧搴旂殑鏋氫妇鍊�
+ public static DeviceStatus fromCode(int code) {
+ for (DeviceStatus status : values()) {
+ if (status.code == code) {
+ return status;
+ }
+ }
+ throw new IllegalArgumentException("鏈煡鐨勬灇涓綾ode: " + code);
+ }
+}
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
index 8a85756..bb8d7bc 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
@@ -16,7 +16,7 @@
<result property="equipCycleContent" column="equip_cycle_content" jdbcType="VARCHAR"/>
<result property="status" column="status" jdbcType="TINYINT"/>
<result property="result" column="result" jdbcType="TINYINT"/>
- <result property="errorCode" column="error_code" jdbcType="VARCHAR"/>
+ <result property="errorMsg" column="error_msg" jdbcType="VARCHAR"/>
<result property="assistants" column="assistants" jdbcType="VARCHAR"/>
<result property="updatedBy" column="updated_by" jdbcType="BIGINT"/>
<result property="inTime" column="in_time" jdbcType="TIMESTAMP"/>
@@ -29,7 +29,7 @@
repair_id,plan_id,station_id,
curr_node,node_content,equip_cycle_content,
status,result,
- error_code,assistants,
+ error_msg,assistants,
updated_by,in_time,out_time,
memo
</sql>
@@ -57,14 +57,14 @@
,repair_id,plan_id,station_id
,curr_node,node_content,equip_cycle_content
,status,result
- ,error_code,assistants
+ ,error_msg,assistants
,updated_by,in_time,out_time
,memo)
values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{workId,jdbcType=BIGINT}
,#{repairId,jdbcType=BIGINT},#{planId,jdbcType=BIGINT},#{stationId,jdbcType=BIGINT}
,#{currNode,jdbcType=BIGINT},#{nodeContent,jdbcType=VARCHAR},#{equipCycleContent,jdbcType=VARCHAR}
,#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT}
- ,#{errorCode,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR}
+ ,#{errorMsg,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR}
,#{updatedBy,jdbcType=BIGINT},#{inTime,jdbcType=TIMESTAMP},#{outTime,jdbcType=TIMESTAMP}
,#{memo,jdbcType=VARCHAR})
</insert>
@@ -82,7 +82,7 @@
<if test="equipCycleContent != null">equip_cycle_content,</if>
<if test="status != null">status,</if>
<if test="result != null">result,</if>
- <if test="errorCode != null">error_code,</if>
+ <if test="errorMsg != null">error_msg,</if>
<if test="assistants != null">assistants,</if>
<if test="updatedBy != null">updated_by,</if>
<if test="inTime != null">in_time,</if>
@@ -101,7 +101,7 @@
<if test="equipCycleContent != null">#{equipCycleContent,jdbcType=VARCHAR},</if>
<if test="status != null">#{status,jdbcType=TINYINT},</if>
<if test="result != null">#{result,jdbcType=TINYINT},</if>
- <if test="errorCode != null">#{errorCode,jdbcType=VARCHAR},</if>
+ <if test="errorMsg != null">#{errorMsg,jdbcType=VARCHAR},</if>
<if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
<if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
<if test="inTime != null">#{inTime,jdbcType=TIMESTAMP},</if>
@@ -142,8 +142,8 @@
<if test="result != null">
result = #{result,jdbcType=TINYINT},
</if>
- <if test="errorCode != null">
- error_code = #{errorCode,jdbcType=VARCHAR},
+ <if test="errorMsg != null">
+ error_msg = #{errorMsg,jdbcType=VARCHAR},
</if>
<if test="assistants != null">
assistants = #{assistants,jdbcType=VARCHAR},
@@ -176,7 +176,7 @@
equip_cycle_content = #{equipCycleContent,jdbcType=VARCHAR},
status = #{status,jdbcType=TINYINT},
result = #{result,jdbcType=TINYINT},
- error_code = #{errorCode,jdbcType=VARCHAR},
+ error_msg = #{errorMsg,jdbcType=VARCHAR},
assistants = #{assistants,jdbcType=VARCHAR},
updated_by = #{updatedBy,jdbcType=BIGINT},
in_time = #{inTime,jdbcType=TIMESTAMP},
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml
index ba7f75c..dffccc8 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml
@@ -16,7 +16,7 @@
<result property="equipCycleContent" column="equip_cycle_content" jdbcType="VARCHAR"/>
<result property="status" column="status" jdbcType="TINYINT"/>
<result property="result" column="result" jdbcType="TINYINT"/>
- <result property="errorCode" column="error_code" jdbcType="VARCHAR"/>
+ <result property="errorMsg" column="error_msg" jdbcType="VARCHAR"/>
<result property="assistants" column="assistants" jdbcType="VARCHAR"/>
<result property="inTime" column="in_time" jdbcType="TIMESTAMP"/>
<result property="outTime" column="out_time" jdbcType="TIMESTAMP"/>
@@ -29,7 +29,7 @@
repair_id,plan_id,station_id,
curr_node,node_content,equip_cycle_content,
status,result,
- error_code,assistants,in_time,
+ error_msg,assistants,in_time,
out_time,updated_by,memo
</sql>
@@ -50,14 +50,14 @@
,repair_id,plan_id,station_id
,curr_node,node_content,equip_cycle_content
,status,result
- ,error_code,assistants,in_time
+ ,error_msg,assistants,in_time
,out_time,updated_by,memo
)
values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{workId,jdbcType=BIGINT}
,#{repairId,jdbcType=BIGINT},#{planId,jdbcType=BIGINT},#{stationId,jdbcType=BIGINT}
,#{currNode,jdbcType=BIGINT},#{nodeContent,jdbcType=VARCHAR},#{equipCycleContent,jdbcType=VARCHAR}
,#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT}
- ,#{errorCode,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR},#{inTime,jdbcType=TIMESTAMP}
+ ,#{errorMsg,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR},#{inTime,jdbcType=TIMESTAMP}
,#{outTime,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=BIGINT},#{memo,jdbcType=VARCHAR}
)
</insert>
@@ -75,7 +75,7 @@
<if test="equipCycleContent != null">equip_cycle_content,</if>
<if test="status != null">status,</if>
<if test="result != null">result,</if>
- <if test="errorCode != null">error_code,</if>
+ <if test="errorMsg != null">error_msg,</if>
<if test="assistants != null">assistants,</if>
<if test="inTime != null">in_time,</if>
<if test="outTime != null">out_time,</if>
@@ -94,7 +94,7 @@
<if test="equipCycleContent != null">#{equipCycleContent,jdbcType=VARCHAR},</if>
<if test="status != null">#{status,jdbcType=TINYINT},</if>
<if test="result != null">#{result,jdbcType=TINYINT},</if>
- <if test="errorCode != null">#{errorCode,jdbcType=VARCHAR},</if>
+ <if test="errorMsg != null">#{errorMsg,jdbcType=VARCHAR},</if>
<if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
<if test="inTime != null">#{inTime,jdbcType=TIMESTAMP},</if>
<if test="outTime != null">#{outTime,jdbcType=TIMESTAMP},</if>
@@ -135,8 +135,8 @@
<if test="result != null">
result = #{result,jdbcType=TINYINT},
</if>
- <if test="errorCode != null">
- error_code = #{errorCode,jdbcType=VARCHAR},
+ <if test="errorMsg != null">
+ error_msg = #{errorMsg,jdbcType=VARCHAR},
</if>
<if test="assistants != null">
assistants = #{assistants,jdbcType=VARCHAR},
@@ -169,7 +169,7 @@
equip_cycle_content = #{equipCycleContent,jdbcType=VARCHAR},
status = #{status,jdbcType=TINYINT},
result = #{result,jdbcType=TINYINT},
- error_code = #{errorCode,jdbcType=VARCHAR},
+ error_msg = #{errorMsg,jdbcType=VARCHAR},
assistants = #{assistants,jdbcType=VARCHAR},
in_time = #{inTime,jdbcType=TIMESTAMP},
out_time = #{outTime,jdbcType=TIMESTAMP},
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
index f3d3bb0..2388fcf 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
@@ -16,7 +16,7 @@
<result property="equipCycleContent" column="equip_cycle_content" jdbcType="VARCHAR"/>
<result property="status" column="status" jdbcType="TINYINT"/>
<result property="result" column="result" jdbcType="TINYINT"/>
- <result property="errorCode" column="error_code" jdbcType="VARCHAR"/>
+ <result property="errorMsg" column="error_msg" jdbcType="VARCHAR"/>
<result property="assistants" column="assistants" jdbcType="VARCHAR"/>
<result property="inTime" column="in_time" jdbcType="TIMESTAMP"/>
<result property="outTime" column="out_time" jdbcType="TIMESTAMP"/>
@@ -29,7 +29,7 @@
repair_id,plan_id,station_id,
curr_node,node_content,equip_cycle_content,
status,result,
- error_code,assistants,in_time,
+ error_msg,assistants,in_time,
out_time,updated_by,memo
</sql>
@@ -50,14 +50,14 @@
,repair_id,plan_id,station_id
,curr_node,node_content,equip_cycle_content
,status,result
- ,error_code,assistants,in_time
+ ,error_msg,assistants,in_time
,out_time,updated_by,memo
)
values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{workId,jdbcType=BIGINT}
,#{repairId,jdbcType=BIGINT},#{planId,jdbcType=BIGINT},#{stationId,jdbcType=BIGINT}
,#{currNode,jdbcType=BIGINT},#{nodeContent,jdbcType=VARCHAR},#{equipCycleContent,jdbcType=VARCHAR}
,#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT}
- ,#{errorCode,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR},#{inTime,jdbcType=TIMESTAMP}
+ ,#{errorMsg,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR},#{inTime,jdbcType=TIMESTAMP}
,#{outTime,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=BIGINT},#{memo,jdbcType=VARCHAR}
)
</insert>
@@ -75,7 +75,7 @@
<if test="equipCycleContent != null">equip_cycle_content,</if>
<if test="status != null">status,</if>
<if test="result != null">result,</if>
- <if test="errorCode != null">error_code,</if>
+ <if test="errorMsg != null">error_msg,</if>
<if test="assistants != null">assistants,</if>
<if test="inTime != null">in_time,</if>
<if test="outTime != null">out_time,</if>
@@ -94,7 +94,7 @@
<if test="equipCycleContent != null">#{equipCycleContent,jdbcType=VARCHAR},</if>
<if test="status != null">#{status,jdbcType=TINYINT},</if>
<if test="result != null">#{result,jdbcType=TINYINT},</if>
- <if test="errorCode != null">#{errorCode,jdbcType=VARCHAR},</if>
+ <if test="errorMsg != null">#{errorMsg,jdbcType=VARCHAR},</if>
<if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
<if test="inTime != null">#{inTime,jdbcType=TIMESTAMP},</if>
<if test="outTime != null">#{outTime,jdbcType=TIMESTAMP},</if>
@@ -135,8 +135,8 @@
<if test="result != null">
result = #{result,jdbcType=TINYINT},
</if>
- <if test="errorCode != null">
- error_code = #{errorCode,jdbcType=VARCHAR},
+ <if test="errorMsg != null">
+ error_msg = #{errorMsg,jdbcType=VARCHAR},
</if>
<if test="assistants != null">
assistants = #{assistants,jdbcType=VARCHAR},
@@ -169,7 +169,7 @@
equip_cycle_content = #{equipCycleContent,jdbcType=VARCHAR},
status = #{status,jdbcType=TINYINT},
result = #{result,jdbcType=TINYINT},
- error_code = #{errorCode,jdbcType=VARCHAR},
+ error_msg = #{errorMsg,jdbcType=VARCHAR},
assistants = #{assistants,jdbcType=VARCHAR},
in_time = #{inTime,jdbcType=TIMESTAMP},
out_time = #{outTime,jdbcType=TIMESTAMP},
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java
index 66d7081..1c86103 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java
@@ -57,4 +57,20 @@
List<PltProductTestInspectionItems> result = sv.getTestItems(proId);
return BaseResponseUtils.buildSuccess(result);
}
+
+ /**
+ * 娴嬭瘯鎴栧搧妫�閮借皟鐢ㄨ繖涓帴鍙�
+ * @param vo
+ * @return
+ */
+ @PostMapping(path = "testing")
+ public BaseResponse testing(@RequestBody @Valid QueryVo vo) {
+ log.info("AssemblyStepCtrl.testing()");
+ int count = sv.testing(vo);
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
+ }
}
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
index cbd6c1e..44c26a6 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
@@ -1,16 +1,20 @@
package com.dy.pmsStation.assemblyStep;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.dy.pmsGlobal.daoPlt.PltProductMapper;
import com.dy.pmsGlobal.daoPlt.PltProductQualityInspectionItemsMapper;
import com.dy.pmsGlobal.daoPlt.PltProductTestInspectionItemsMapper;
import com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper;
import com.dy.pmsGlobal.daoPr.PrProductionNodeMapper;
import com.dy.pmsGlobal.daoSta.*;
+import com.dy.pmsGlobal.pojoPlt.PltProduct;
import com.dy.pmsGlobal.pojoPlt.PltProductQualityInspectionItems;
import com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import com.dy.pmsGlobal.pojoPr.PrProductionNode;
import com.dy.pmsGlobal.pojoSta.*;
+import com.dy.pmsGlobal.util.DeviceStatus;
import com.dy.pmsGlobal.util.QrCodeConstant;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -23,10 +27,10 @@
@Slf4j
@Service
public class AssemblyStepSv {
- private static final int STATUS_OK = 1;
- private static final int STATUS_COMPLETE = 2;
- private static final int STATUS_REPAIR = 3;
- private static final int STATUS_WASTE = 4;
+ private static final String WORK_TYPE_ASSEMBLY = "1";
+ private static final String WORK_TYPE_TEST = "2";
+ private static final String WORK_TYPE_INSPECTION = "3";
+ private static final String WORK_TYPE_REPAIR = "4";
private StaDeviceLastMapper deviceLastDao;
private StaDeviceLifeMapper deviceLifeDao;
@@ -39,55 +43,50 @@
private StaRepairInfoMapper repairInfoDao;
private PltProductQualityInspectionItemsMapper qualityItemsDao;
private PltProductTestInspectionItemsMapper testItemsDao;
-
+ private PltProductMapper productDao;
@Autowired
public void setDeviceLastDao(StaDeviceLastMapper deviceLastDao) {
this.deviceLastDao = deviceLastDao;
}
-
@Autowired
public void setDeviceLifeDao(StaDeviceLifeMapper deviceLifeDao) {
this.deviceLifeDao = deviceLifeDao;
}
-
@Autowired
public void setWipSnExDao(StaWipSnExMapper wipSnExDao) {
this.wipSnExDao = wipSnExDao;
}
-
@Autowired
public void setDeviceProductionLogDao(StaDeviceProductionLogMapper deviceProductionLogDao) {
this.deviceProductionLogDao = deviceProductionLogDao;
}
-
@Autowired
public void setAssemblyWorkLastDao(StaAssemblyWorkLastMapper assemblyWorkLastDao) {
this.assemblyWorkLastDao = assemblyWorkLastDao;
}
-
@Autowired
public void setAssemblyPlanDao(PrAssemblyPlanMapper assemblyPlanDao) {
this.assemblyPlanDao = assemblyPlanDao;
}
-
@Autowired
public void setNodeDao(PrProductionNodeMapper nodeDao) {
this.nodeDao = nodeDao;
}
-
@Autowired
public void setRepairInfoDao(StaRepairInfoMapper repairInfoDao) {
this.repairInfoDao = repairInfoDao;
}
-
@Autowired
public void setQualityItemsDao(PltProductQualityInspectionItemsMapper qualityItemsDao) {
this.qualityItemsDao = qualityItemsDao;
}
-
@Autowired
public void setTestItemsDao(PltProductTestInspectionItemsMapper testItemsDao) {
this.testItemsDao = testItemsDao;
+ }
+ @Autowired
+ public void setProductDao(PltProductMapper productDao) {
+ this.productDao = productDao;
}
@Transactional
@@ -103,11 +102,11 @@
// 鍒嗙被璁惧鍙峰拰鐗╂枡鍙�
List<String> deviceList = new ArrayList<>();
List<String> materialList = new ArrayList<>();
-
+ List<PltProduct> productList = productDao.selectAll(null);
deviceSet.forEach(device -> {
if (device.contains(plan.batchNo)) {
deviceList.add(device);
- } else {
+ } else if(isOurProduct(device,productList)){
materialList.add(device);
}
});
@@ -148,7 +147,7 @@
deviceLifeDao.insertSelective(life);
}
- private StaDeviceLast buildDeviceLast(QueryVo params, StaAssemblyWorkLast workLast, String deviceNo) {
+ private StaDeviceLast buildDeviceLast(QueryVo params, StaAssemblyWorkLast workLast,String deviceNo) {
//缁勮鏁版嵁
StaDeviceLast record = new StaDeviceLast();
@@ -164,7 +163,6 @@
record.stationId = workLast.stationId;
record.equipNo = deviceNo;
record.currNode = workLast.nodeId;
-// record.setNextNode(getNextNode(params.status,workLast.nodeId));
record.updatedBy = workLast.userId;
record.assistants = params.assistants;
@@ -174,7 +172,7 @@
if (node.isRecord) {
record.equipCycleContent = node.equipCycleContent;
}
- record.status = getStatus(params.status, node.isEnd);
+ record.status = getStatus(params.status, node.isEnd,params.workType);
return record;
}
@@ -198,13 +196,25 @@
* @param isEndNode 鏄惁缁撴潫鑺傜偣
* @return 鐘舵��
*/
- private int getStatus(String status, boolean isEndNode) {
- return switch (status) {
- case QrCodeConstant.MarkOk -> isEndNode ? STATUS_COMPLETE : STATUS_OK;
- case QrCodeConstant.MarkUnqualified -> STATUS_REPAIR;
- case QrCodeConstant.MarkWaste -> STATUS_WASTE;
- default -> throw new RuntimeException("鐘舵�侀敊璇�");
- };
+ private int getStatus(String status, boolean isEndNode,String workType) {
+ //缁勮,缁翠慨
+ if (WORK_TYPE_ASSEMBLY.equals(workType)||WORK_TYPE_REPAIR.equals(workType)) {
+ return switch (status) {
+ case QrCodeConstant.MarkOk -> isEndNode? DeviceStatus.COMPLETED.getCode(): DeviceStatus.ASSEMBLING.getCode();
+ case QrCodeConstant.MarkUnqualified, QrCodeConstant.MarkPreUnqualified -> DeviceStatus.REPAIR.getCode();
+ case QrCodeConstant.MarkWaste -> DeviceStatus.WASTE.getCode();
+ default -> throw new RuntimeException("鐘舵�侀敊璇�");
+ };
+ //鍝佹,娴嬭瘯
+ }else if(WORK_TYPE_INSPECTION.equals(workType)||WORK_TYPE_TEST.equals(workType)){
+ return switch (status) {
+ case QrCodeConstant.MarkOk -> DeviceStatus.COMPLETED.getCode();
+ case QrCodeConstant.MarkUnqualified -> DeviceStatus.TEST_FAILED.getCode();
+ case QrCodeConstant.MarkWaste -> DeviceStatus.WASTE.getCode();
+ default -> throw new RuntimeException("鐘舵�侀敊璇�");
+ };
+ }
+ throw new RuntimeException("鐘舵�侀敊璇紝鏃犳晥鐨勮妭鐐圭被鍨�: " + workType);
}
public int repair(QueryVo vo) {
@@ -223,25 +233,29 @@
repairInfo.fromNode = preDeviceRecord.currNode;
repairInfoDao.insertSelective(repairInfo);
- StaDeviceLast deviceLast = new StaDeviceLast();
- BeanUtils.copyProperties(preDeviceRecord, deviceLast);
- deviceLast.repairId = repairInfo.id;
- deviceLast.errorCode = vo.errorMsg;
- deviceLast.assistants = vo.assistants;
- //濡傛灉鍘熻妭鐐规槸缁撴潫鑺傜偣鎴栦箣鍚庣殑鑺傜偣锛屾槸鍒欐洿鏂颁负瀹屾垚,鍚﹀垯鏇存柊涓虹粍瑁呬腑(榛樿缁翠慨鑺傜偣鐨勭姸鎬佸彧鑳戒负 纭畾鎴� 鎶ュ簾)
- boolean isEndNode = nodeDao.isEndNode(preDeviceRecord.currNode);
- if (QrCodeConstant.MarkWaste.equals(vo.status)) {
- deviceLast.status = STATUS_WASTE;
- } else {
- deviceLast.status = isEndNode ? STATUS_COMPLETE : STATUS_OK;
- }
+ StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo);
+
int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
deviceLastDao.updateByPrimaryKeySelective(deviceLast);
saveDeviceProductionLog(deviceLast);
-
+ boolean isEndNode = nodeDao.isEndNode(preDeviceRecord.currNode);
if (isEndNode) {
saveDeviceLife(deviceLast);
}
+ return count;
+ }
+
+ public int testing(QueryVo vo) {
+ long workId = Long.parseLong(vo.workId);
+ StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(workId);
+ if (workLast == null) {
+ throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
+ }
+
+ StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo);
+ int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
+ deviceLastDao.updateByPrimaryKeySelective(deviceLast);
+ saveDeviceProductionLog(deviceLast);
return count;
}
@@ -257,4 +271,15 @@
params.put("proId", proId);
return testItemsDao.selectSome(params);
}
+
+ private boolean isOurProduct(String deviceNo, List<PltProduct> products){
+ if(StringUtils.isNotEmpty(deviceNo) && deviceNo.length() ==22 ){
+ for(PltProduct product:products){
+ if(deviceNo.startsWith(QrCodeConstant.TypeProduct + product.getCode())){
+ return true;
+ }
+ }
+ }
+ return false;
+ }
}
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/QueryVo.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/QueryVo.java
index 6ef34d1..9e8e56b 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/QueryVo.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/QueryVo.java
@@ -25,5 +25,7 @@
* 杈呭姪浜哄憳
*/
public String assistants;
+ @NotNull(message = "宸ヤ綔绫诲瀷涓嶈兘涓虹┖")
+ public String workType;
}
--
Gitblit v1.8.0