From 30a83b7337706fff402a5e360dca96745d48f59a Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 17 二月 2025 13:20:56 +0800
Subject: [PATCH] 撤回流程的补充
---
src/main/java/com/gs/xky/service/Impl/MesQaItemsDetectDetail12ServiceImpl.java | 22 +
src/main/java/com/gs/xky/service/Impl/MesQaItemsDetectDetail5ServiceImpl.java | 22 +
src/main/java/com/gs/xky/mapper/MesQaItemsDetectDetail5Mapper.java | 18 +
src/main/java/com/gs/xky/mapper/MesQaItemsDetect01Mapper.java | 18 +
src/main/resources/mapper/MesQaItemsDetectDetail12Mapper.xml | 7
src/main/java/com/gs/xky/service/Impl/MesQaItemsDetect01ServiceImpl.java | 62 ++++
src/main/java/com/gs/xky/service/MesQaItemsDetectDetail12Service.java | 13 +
src/main/resources/mapper/MesQaItemsDetectDetail5Mapper.xml | 7
src/main/resources/mapper/MesQaItemsDetect01Mapper.xml | 7
src/main/java/com/gs/xky/service/MesQaItemsDetectDetail5Service.java | 13 +
src/main/java/com/gs/xky/entity/MesQaItemsDetect01.java | 339 ++++++++++++++++++++++++++
src/main/java/com/gs/xky/service/XkyService.java | 7
src/main/java/com/gs/xky/config/BodyParam.java | 2
src/main/java/com/gs/xky/entity/MesQaItemsDetectDetail12.java | 70 +++++
src/main/java/com/gs/xky/service/MesQaItemsDetect01Service.java | 14 +
src/main/java/com/gs/xky/mapper/MesQaItemsDetectDetail12Mapper.java | 18 +
src/main/java/com/gs/xky/entity/MesQaItemsDetectDetail5.java | 135 ++++++++++
17 files changed, 771 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gs/xky/config/BodyParam.java b/src/main/java/com/gs/xky/config/BodyParam.java
index faa9e15..9a1db45 100644
--- a/src/main/java/com/gs/xky/config/BodyParam.java
+++ b/src/main/java/com/gs/xky/config/BodyParam.java
@@ -28,7 +28,7 @@
private int[] status;
- private int logisticsStatus;
+// private int logisticsStatus;
private String deliveryNo;
diff --git a/src/main/java/com/gs/xky/entity/MesQaItemsDetect01.java b/src/main/java/com/gs/xky/entity/MesQaItemsDetect01.java
new file mode 100644
index 0000000..40d05bb
--- /dev/null
+++ b/src/main/java/com/gs/xky/entity/MesQaItemsDetect01.java
@@ -0,0 +1,339 @@
+package com.gs.xky.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 鏉ユ枡鍏ュ簱妫�楠岃〃澶�
+ *
+ * @TableName MES_QA_ITEMS_DETECT_01
+ */
+@TableName(value = "MES_QA_ITEMS_DETECT_01")
+@Data
+public class MesQaItemsDetect01 implements Serializable {
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+ /**
+ *
+ */
+ @TableId
+ private Long id;
+ /**
+ * 妫�楠屽崟鍙�
+ */
+ private String releaseNo;
+ /**
+ * 妫�楠屾棩鏈�
+ */
+ private Date fcheckDate;
+ /**
+ * 妫�楠屼汉鍛�
+ */
+ private String fcheckBy;
+ /**
+ * 鐗╂枡缂栫爜
+ */
+ private String itemNo;
+ /**
+ * 鏉ユ枡鏁伴噺
+ */
+ private BigDecimal fbatchQty;
+ /**
+ * 鎺ユ敹鏁伴噺
+ */
+ private String freceQty;
+ /**
+ * 渚涘簲鍟嗙紪鍙�
+ */
+ private String suppNo;
+ /**
+ * 澶囨敞
+ */
+ private String fngDesc;
+ /**
+ * 妫�楠岀粨鏋�
+ */
+ private String fcheckResu;
+ /**
+ * OA璇勫鍙嶉
+ */
+ private String freview;
+ /**
+ * 妫�楠屾按鍑�
+ */
+ private String sampleSizeNo;
+ /**
+ * 妫�楠屾按骞�
+ */
+ private String fcheckLevel;
+ /**
+ * 鎷掓敹姘村钩
+ */
+ private String facLevel;
+ /**
+ * 鎶芥鏁伴噺
+ */
+ private String checkQty;
+ /**
+ * 鎵规鍙� --鍒拌揣鍗曞彿
+ */
+ private String lotNo;
+ /**
+ * 鏄惁鎺ㄩ��
+ */
+ private String fmove;
+ /**
+ * 鏄惁澶勭悊
+ */
+ private String fhandle;
+ /**
+ * 鍒涘缓浜�
+ */
+ private String createBy;
+ /**
+ * 鍒涘缓鏃ユ湡
+ */
+ private Date createDate;
+ /**
+ * 鏇存柊浜�
+ */
+ private String lastupdateBy;
+ /**
+ * 鏇存柊鏃ユ湡
+ */
+ private Date lastupdateDate;
+ /**
+ * 鏄惁瀹℃牳
+ */
+ private Long modify1Flag;
+ /**
+ * 瀹℃牳浜�
+ */
+ private String modify1By;
+ /**
+ * 瀹℃牳鏃ユ湡
+ */
+ private Date modify1Date;
+ /**
+ *
+ */
+ private String factory;
+ /**
+ * XRF娴嬭瘯鎶ュ憡缂栧彿
+ */
+ private String fcheckRepno;
+ /**
+ * 绗笁鏂规姤鍛�
+ */
+ private String fthirdRep;
+ /**
+ * 鏄惁浣滃簾
+ */
+ private Long fcancel;
+ /**
+ * 鎻愪氦鏍囪瘑
+ */
+ private Long fsubmit;
+ /**
+ * 妫�楠屼緷鎹�
+ */
+ private String fcheckAccord;
+ /**
+ * 绫诲瀷(0 鏉ユ枡 1 鍦ㄥ簱)
+ */
+ private Integer ftype;
+ /**
+ * 鍗曚綅
+ */
+ private String itemUnit;
+ /**
+ * 鍑鸿揣鏃ユ湡
+ */
+ private String outDate;
+ /**
+ * 鏄惁鍏嶆
+ */
+ private Long fexemption;
+ /**
+ * 妗ｄ綅鏍囧噯
+ */
+ private String fgearStand;
+ /**
+ * 涓嶈壇鏈�缁堝鐞嗘柟寮�
+ */
+ private String fngHandle;
+ /**
+ * 绠＄悊缂栧彿
+ */
+ private String fmanageNo;
+ /**
+ * 杞崲鏁伴噺
+ */
+ private String fcovertQty;
+ /**
+ * 鐗堟湰
+ */
+ private Long fversion;
+ /**
+ *
+ */
+ private String company;
+ /**
+ *
+ */
+ private String fsecondResu;
+ /**
+ * 鏈�澶ф娊妫�鏁�
+ */
+ private Long maxCheckQty;
+ /**
+ * 鐗瑰畾淇敼鏄惁瀹℃牳
+ */
+ private Long modify1Flag1;
+ /**
+ * 鐗瑰畾淇敼瀹℃牳浜�
+ */
+ private String modify1By1;
+ /**
+ * 鐗瑰畾淇敼瀹℃牳鏃堕棿
+ */
+ private Date modify1Date1;
+ /**
+ * 灏忔壒娆″彿
+ */
+ private String lotNo1;
+ /**
+ * 閲囪喘鍗曞彿
+ */
+ private String lotNo2;
+ /**
+ * 浜у搧鍨嬪彿
+ */
+ private String boardStyle;
+ /**
+ * 浠诲姟鍗曞彿
+ */
+ private String workNo;
+ /**
+ * 鍒拌揣鏃堕棿
+ */
+ private String dha018;
+ /**
+ * 琛屽彿
+ */
+ private Long dhb002;
+ /**
+ * 鍒拌揣鍗曞彿
+ */
+ private String dhb001;
+ /**
+ * 渚涘簲鍟�
+ */
+ private String lifnr;
+ /**
+ * 閫�鏂欐柟寮�
+ */
+ private String fmrmode;
+ /**
+ * erp杩斿洖淇℃伅
+ */
+ private String msg;
+ /**
+ * 鐘舵��
+ */
+ private String states;
+ /**
+ * IQC鎻愪氦鏃堕棿
+ */
+ private Date iqcDate;
+ /**
+ * 閲囪喘璁㈠崟ID
+ */
+ private Long ebelnK3id;
+ /**
+ * 閲囪喘璁㈠崟琛孖D
+ */
+ private Long lineK3id;
+ /**
+ * 鍝佽川瀹℃牳鏍囪瘑
+ */
+ private Long qualityAudit;
+ /**
+ * 鐗╂枡ID
+ */
+ private Long itemId;
+ /**
+ * 楠屾敹鏁�
+ */
+ private Long yansNum;
+ /**
+ * 楠岄��鏁�
+ */
+ private Long yantNum;
+ /**
+ * 閲囪喘瀹℃牳鏍囪瘑
+ */
+ private Long cgAudit;
+ /**
+ * 閲囪喘鎰忚
+ */
+ private String cgOpinion;
+ /**
+ * 閲囪喘澶勭悊鏂瑰紡
+ */
+ private String cgHandle;
+ /**
+ * 鍝佽川鎰忚
+ */
+ private String qcOpinion;
+ /**
+ * 鍝佽川澶勭悊鏂瑰紡
+ */
+ private String qcHandle;
+ /**
+ * 缁忕悊瀹℃牳鏍囪瘑
+ */
+ private Long managerAudit;
+ /**
+ * 缁忕悊鎰忚
+ */
+ private String managerOpinion;
+ /**
+ * 缁忕悊澶勭悊鏂瑰紡
+ */
+ private String managerHandle;
+ /**
+ * 閿�鍞鍗�
+ */
+ private String salesOrder;
+ /**
+ * 閲囪喘瀹℃牳浜�
+ */
+ private String cgUser;
+ /**
+ * 鍝佽川瀹℃牳浜�
+ */
+ private String qcUser;
+ /**
+ * 缁忕悊瀹℃牳浜�
+ */
+ private String managerUser;
+ /**
+ * 璁″垝璺熻釜鍙�
+ */
+ private String fmtono;
+ /**
+ * 瀹為獙瀹ら�佹鏍囪瘑
+ */
+ private Long isSj;
+ /**
+ * 瀹為獙瀹ら�佹鍗曞彿
+ */
+ private String sjNo;
+}
\ No newline at end of file
diff --git a/src/main/java/com/gs/xky/entity/MesQaItemsDetectDetail12.java b/src/main/java/com/gs/xky/entity/MesQaItemsDetectDetail12.java
new file mode 100644
index 0000000..c5c7dfb
--- /dev/null
+++ b/src/main/java/com/gs/xky/entity/MesQaItemsDetectDetail12.java
@@ -0,0 +1,70 @@
+package com.gs.xky.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * IQC妫�楠�
+ *
+ * @TableName MES_QA_ITEMS_DETECT_DETAIL12
+ */
+@TableName(value = "MES_QA_ITEMS_DETECT_DETAIL12")
+@Data
+public class MesQaItemsDetectDetail12 implements Serializable {
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+ /**
+ *
+ */
+ @TableId
+ private Long id;
+ /**
+ * 妫�楠岀粨鏋�
+ */
+ private String fcheckResu;
+ /**
+ * 妫�楠岄」鐩�
+ */
+ private String fcheckItem;
+ /**
+ * 鐗╂枡鏉＄爜
+ */
+ private String itemBarcode;
+ /**
+ *
+ */
+ private String releaseNo;
+ /**
+ *
+ */
+ private Long mainId;
+ /**
+ *
+ */
+ private Date createDate;
+ /**
+ *
+ */
+ private String company;
+ /**
+ *
+ */
+ private String factory;
+ /**
+ *
+ */
+ private String fstand;
+ /**
+ * 鐢熸垚浜�
+ */
+ private String lastupdateBy;
+ /**
+ *
+ */
+ private String createBy;
+}
\ No newline at end of file
diff --git a/src/main/java/com/gs/xky/entity/MesQaItemsDetectDetail5.java b/src/main/java/com/gs/xky/entity/MesQaItemsDetectDetail5.java
new file mode 100644
index 0000000..ed677df
--- /dev/null
+++ b/src/main/java/com/gs/xky/entity/MesQaItemsDetectDetail5.java
@@ -0,0 +1,135 @@
+package com.gs.xky.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 鏉ユ枡妫�楠屼粠琛�
+ *
+ * @TableName MES_QA_ITEMS_DETECT_DETAIL5
+ */
+@TableName(value = "MES_QA_ITEMS_DETECT_DETAIL5")
+@Data
+public class MesQaItemsDetectDetail5 implements Serializable {
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+ /**
+ *
+ */
+ @TableId
+ private Long id;
+ /**
+ * 鏍囧噯鍊肩被鍨�
+ */
+ private String ftextType;
+ /**
+ * 鏍囧噯鍊�
+ */
+ private Long fstand;
+ /**
+ * 涓婂叕宸�
+ */
+ private String fupAllow;
+ /**
+ * 涓嬪叕宸�
+ */
+ private String fdownAllow;
+ /**
+ * 妫�楠屾按鍑�
+ */
+ private String sampleSizeNo;
+ /**
+ * 妫�楠屾按骞�
+ */
+ private String fcheckLevel;
+ /**
+ * 鎷掓敹姘村钩
+ */
+ private String facLevel;
+ /**
+ * 妫�楠岄」鐩�
+ */
+ private String fcheckItem;
+ /**
+ * 瑙勬牸瑕佹眰
+ */
+ private String fspecRequ;
+ /**
+ * 鎶芥鏁伴噺
+ */
+ private Long checkQyt;
+ /**
+ * 妫�楠岀粨鏋�
+ */
+ private String fcheckResu;
+ /**
+ * AC鏁伴噺
+ */
+ private Long facQty;
+ /**
+ * RE鏁伴噺
+ */
+ private Long freQty;
+ /**
+ * 涓嶅悎鏍兼暟
+ */
+ private Long fngQty;
+ /**
+ * 涓嶈壇鐜�
+ */
+ private BigDecimal fngRate;
+ /**
+ * 宸插綍鍏ユ暟閲�
+ */
+ private BigDecimal fenterQty;
+ /**
+ *
+ */
+ private String releaseNo;
+ /**
+ *
+ */
+ private String company;
+ /**
+ *
+ */
+ private String factory;
+ /**
+ * 妫�楠岄」鐩弿杩�
+ */
+ private String fcheckItemDesc;
+ /**
+ * 宸ュ簭鍙�
+ */
+ private String procNo;
+ /**
+ * 宸ヤ綔涓績缂栫爜
+ */
+ private String workshopCenterCode;
+ /**
+ * 鍗曚綅
+ */
+ private String funit;
+ /**
+ * 鐗瑰畾淇敼
+ */
+ private Integer givenModify;
+ /**
+ * 妫�楠屽伐鍏�
+ */
+ private String fcheckTool;
+ /**
+ * 鏇存柊浜�
+ */
+ private String lastupdateBy;
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ private Date lastupdateDate;
+}
\ No newline at end of file
diff --git a/src/main/java/com/gs/xky/mapper/MesQaItemsDetect01Mapper.java b/src/main/java/com/gs/xky/mapper/MesQaItemsDetect01Mapper.java
new file mode 100644
index 0000000..627d3c6
--- /dev/null
+++ b/src/main/java/com/gs/xky/mapper/MesQaItemsDetect01Mapper.java
@@ -0,0 +1,18 @@
+package com.gs.xky.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gs.xky.entity.MesQaItemsDetect01;
+
+/**
+ * @author 28567
+ * @description 閽堝琛ㄣ�怣ES_QA_ITEMS_DETECT_01(鏉ユ枡鍏ュ簱妫�楠岃〃澶�)銆戠殑鏁版嵁搴撴搷浣淢apper
+ * @createDate 2025-02-17 12:53:02
+ * @Entity com.gs.xky.entity.MesQaItemsDetect01
+ */
+public interface MesQaItemsDetect01Mapper extends BaseMapper<MesQaItemsDetect01> {
+
+}
+
+
+
+
diff --git a/src/main/java/com/gs/xky/mapper/MesQaItemsDetectDetail12Mapper.java b/src/main/java/com/gs/xky/mapper/MesQaItemsDetectDetail12Mapper.java
new file mode 100644
index 0000000..411061c
--- /dev/null
+++ b/src/main/java/com/gs/xky/mapper/MesQaItemsDetectDetail12Mapper.java
@@ -0,0 +1,18 @@
+package com.gs.xky.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gs.xky.entity.MesQaItemsDetectDetail12;
+
+/**
+ * @author 28567
+ * @description 閽堝琛ㄣ�怣ES_QA_ITEMS_DETECT_DETAIL12(IQC妫�楠�)銆戠殑鏁版嵁搴撴搷浣淢apper
+ * @createDate 2025-02-17 12:53:29
+ * @Entity com.gs.xky.entity.MesQaItemsDetectDetail12
+ */
+public interface MesQaItemsDetectDetail12Mapper extends BaseMapper<MesQaItemsDetectDetail12> {
+
+}
+
+
+
+
diff --git a/src/main/java/com/gs/xky/mapper/MesQaItemsDetectDetail5Mapper.java b/src/main/java/com/gs/xky/mapper/MesQaItemsDetectDetail5Mapper.java
new file mode 100644
index 0000000..27fad94
--- /dev/null
+++ b/src/main/java/com/gs/xky/mapper/MesQaItemsDetectDetail5Mapper.java
@@ -0,0 +1,18 @@
+package com.gs.xky.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gs.xky.entity.MesQaItemsDetectDetail5;
+
+/**
+ * @author 28567
+ * @description 閽堝琛ㄣ�怣ES_QA_ITEMS_DETECT_DETAIL5(鏉ユ枡妫�楠屼粠琛�)銆戠殑鏁版嵁搴撴搷浣淢apper
+ * @createDate 2025-02-17 12:53:24
+ * @Entity com.gs.xky.entity.MesQaItemsDetectDetail5
+ */
+public interface MesQaItemsDetectDetail5Mapper extends BaseMapper<MesQaItemsDetectDetail5> {
+
+}
+
+
+
+
diff --git a/src/main/java/com/gs/xky/service/Impl/MesQaItemsDetect01ServiceImpl.java b/src/main/java/com/gs/xky/service/Impl/MesQaItemsDetect01ServiceImpl.java
new file mode 100644
index 0000000..0c2b911
--- /dev/null
+++ b/src/main/java/com/gs/xky/service/Impl/MesQaItemsDetect01ServiceImpl.java
@@ -0,0 +1,62 @@
+package com.gs.xky.service.Impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gs.xky.entity.MesQaItemsDetect01;
+import com.gs.xky.entity.MesQaItemsDetectDetail12;
+import com.gs.xky.entity.MesQaItemsDetectDetail5;
+import com.gs.xky.mapper.MesQaItemsDetect01Mapper;
+import com.gs.xky.service.MesQaItemsDetect01Service;
+import com.gs.xky.service.MesQaItemsDetectDetail12Service;
+import com.gs.xky.service.MesQaItemsDetectDetail5Service;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @author 28567
+ * @description 閽堝琛ㄣ�怣ES_QA_ITEMS_DETECT_01(鏉ユ枡鍏ュ簱妫�楠岃〃澶�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+ * @createDate 2025-02-17 12:53:02
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+@RequiredArgsConstructor
+public class MesQaItemsDetect01ServiceImpl extends ServiceImpl<MesQaItemsDetect01Mapper, MesQaItemsDetect01>
+ implements MesQaItemsDetect01Service {
+
+ private final MesQaItemsDetectDetail5Service detectDetail5Service;
+ private final MesQaItemsDetectDetail12Service detectDetail12Service;
+
+
+ @Override
+ public boolean removeQa(String lotNo) {
+
+ LambdaQueryWrapper<MesQaItemsDetect01> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(MesQaItemsDetect01::getLotNo, lotNo);
+ MesQaItemsDetect01 one = getOne(wrapper, false);
+ if (one == null) {
+ return false;
+ }
+
+ LambdaUpdateWrapper<MesQaItemsDetect01> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(MesQaItemsDetect01::getReleaseNo, one.getReleaseNo());
+ if (remove(wrapper)) {
+ LambdaQueryWrapper<MesQaItemsDetectDetail5> wrapper1 = new LambdaQueryWrapper<>();
+
+ wrapper1.eq(MesQaItemsDetectDetail5::getReleaseNo, one.getReleaseNo());
+ detectDetail5Service.remove(wrapper1);
+
+ LambdaQueryWrapper<MesQaItemsDetectDetail12> wrapper2 = new LambdaQueryWrapper<>();
+
+ wrapper2.eq(MesQaItemsDetectDetail12::getReleaseNo, one.getReleaseNo());
+ detectDetail12Service.remove(wrapper2);
+ }
+
+ return true;
+ }
+}
+
+
+
+
diff --git a/src/main/java/com/gs/xky/service/Impl/MesQaItemsDetectDetail12ServiceImpl.java b/src/main/java/com/gs/xky/service/Impl/MesQaItemsDetectDetail12ServiceImpl.java
new file mode 100644
index 0000000..cfa6464
--- /dev/null
+++ b/src/main/java/com/gs/xky/service/Impl/MesQaItemsDetectDetail12ServiceImpl.java
@@ -0,0 +1,22 @@
+package com.gs.xky.service.Impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gs.xky.entity.MesQaItemsDetectDetail12;
+import com.gs.xky.mapper.MesQaItemsDetectDetail12Mapper;
+import com.gs.xky.service.MesQaItemsDetectDetail12Service;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author 28567
+ * @description 閽堝琛ㄣ�怣ES_QA_ITEMS_DETECT_DETAIL12(IQC妫�楠�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+ * @createDate 2025-02-17 12:53:29
+ */
+@Service
+public class MesQaItemsDetectDetail12ServiceImpl extends ServiceImpl<MesQaItemsDetectDetail12Mapper, MesQaItemsDetectDetail12>
+ implements MesQaItemsDetectDetail12Service {
+
+}
+
+
+
+
diff --git a/src/main/java/com/gs/xky/service/Impl/MesQaItemsDetectDetail5ServiceImpl.java b/src/main/java/com/gs/xky/service/Impl/MesQaItemsDetectDetail5ServiceImpl.java
new file mode 100644
index 0000000..aad2bf3
--- /dev/null
+++ b/src/main/java/com/gs/xky/service/Impl/MesQaItemsDetectDetail5ServiceImpl.java
@@ -0,0 +1,22 @@
+package com.gs.xky.service.Impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gs.xky.entity.MesQaItemsDetectDetail5;
+import com.gs.xky.mapper.MesQaItemsDetectDetail5Mapper;
+import com.gs.xky.service.MesQaItemsDetectDetail5Service;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author 28567
+ * @description 閽堝琛ㄣ�怣ES_QA_ITEMS_DETECT_DETAIL5(鏉ユ枡妫�楠屼粠琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+ * @createDate 2025-02-17 12:53:24
+ */
+@Service
+public class MesQaItemsDetectDetail5ServiceImpl extends ServiceImpl<MesQaItemsDetectDetail5Mapper, MesQaItemsDetectDetail5>
+ implements MesQaItemsDetectDetail5Service {
+
+}
+
+
+
+
diff --git a/src/main/java/com/gs/xky/service/MesQaItemsDetect01Service.java b/src/main/java/com/gs/xky/service/MesQaItemsDetect01Service.java
new file mode 100644
index 0000000..1458a59
--- /dev/null
+++ b/src/main/java/com/gs/xky/service/MesQaItemsDetect01Service.java
@@ -0,0 +1,14 @@
+package com.gs.xky.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gs.xky.entity.MesQaItemsDetect01;
+
+/**
+ * @author 28567
+ * @description 閽堝琛ㄣ�怣ES_QA_ITEMS_DETECT_01(鏉ユ枡鍏ュ簱妫�楠岃〃澶�)銆戠殑鏁版嵁搴撴搷浣淪ervice
+ * @createDate 2025-02-17 12:53:02
+ */
+public interface MesQaItemsDetect01Service extends IService<MesQaItemsDetect01> {
+
+ boolean removeQa(String lotNo);
+}
diff --git a/src/main/java/com/gs/xky/service/MesQaItemsDetectDetail12Service.java b/src/main/java/com/gs/xky/service/MesQaItemsDetectDetail12Service.java
new file mode 100644
index 0000000..c82debc
--- /dev/null
+++ b/src/main/java/com/gs/xky/service/MesQaItemsDetectDetail12Service.java
@@ -0,0 +1,13 @@
+package com.gs.xky.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gs.xky.entity.MesQaItemsDetectDetail12;
+
+/**
+ * @author 28567
+ * @description 閽堝琛ㄣ�怣ES_QA_ITEMS_DETECT_DETAIL12(IQC妫�楠�)銆戠殑鏁版嵁搴撴搷浣淪ervice
+ * @createDate 2025-02-17 12:53:29
+ */
+public interface MesQaItemsDetectDetail12Service extends IService<MesQaItemsDetectDetail12> {
+
+}
diff --git a/src/main/java/com/gs/xky/service/MesQaItemsDetectDetail5Service.java b/src/main/java/com/gs/xky/service/MesQaItemsDetectDetail5Service.java
new file mode 100644
index 0000000..0c1a3a8
--- /dev/null
+++ b/src/main/java/com/gs/xky/service/MesQaItemsDetectDetail5Service.java
@@ -0,0 +1,13 @@
+package com.gs.xky.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gs.xky.entity.MesQaItemsDetectDetail5;
+
+/**
+ * @author 28567
+ * @description 閽堝琛ㄣ�怣ES_QA_ITEMS_DETECT_DETAIL5(鏉ユ枡妫�楠屼粠琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice
+ * @createDate 2025-02-17 12:53:24
+ */
+public interface MesQaItemsDetectDetail5Service extends IService<MesQaItemsDetectDetail5> {
+
+}
diff --git a/src/main/java/com/gs/xky/service/XkyService.java b/src/main/java/com/gs/xky/service/XkyService.java
index 57d9c56..7e67ef0 100644
--- a/src/main/java/com/gs/xky/service/XkyService.java
+++ b/src/main/java/com/gs/xky/service/XkyService.java
@@ -36,13 +36,15 @@
private final MesInvItemArnDetailService mesInvItemArnDetailService;
private final MesInvItemBarcodesService mesInvItemBarcodesService;
+ private final MesQaItemsDetect01Service mesQaItemsDetect01Service;
+
public void GetSaveDetail() throws IOException {
long currentTimeMillis = System.currentTimeMillis();
XkyCommonParam param = XkyCommonParam.GetInit();
// 璁＄畻浜斿垎閽熷墠鐨勬椂闂存埑
- long startDate = currentTimeMillis - (5 * 60 * 1000); // 5 鍒嗛挓 = 5 * 60 * 1000 姣
+ long startDate = currentTimeMillis - (6 * 60 * 1000); // 5 鍒嗛挓 = 5 * 60 * 1000 姣
// 鍒涘缓 BodyParam 瀵硅薄骞惰祴鍊�
BodyParam bodyParam = new BodyParam();
@@ -71,7 +73,7 @@
remove(deliveryNo);
- } else if ("2".equals(deliveryNo.getLogisticsStatus())) {
+ } else if ("1".equals(deliveryNo.getStatus()) && "2".equals(deliveryNo.getLogisticsStatus())) {
XkyDetail detail = getDetail(deliveryNo.getDeliveryNo());
deliveryNoticeService.saveDeliveryNotice(detail);
List<BarcodeDeliveryNo> barcodeDeliveryNos = GetBarcodeInformation(deliveryNo.getDeliveryNo());
@@ -124,6 +126,7 @@
updateWrapper3.eq(MesInvItemBarcodes::getBillNo, mesInvItemArn.getBillNo());
mesInvItemBarcodesService.remove(updateWrapper3);
+ mesQaItemsDetect01Service.removeQa(mesInvItemArn.getBillNo());
}
}
}
diff --git a/src/main/resources/mapper/MesQaItemsDetect01Mapper.xml b/src/main/resources/mapper/MesQaItemsDetect01Mapper.xml
new file mode 100644
index 0000000..b279d91
--- /dev/null
+++ b/src/main/resources/mapper/MesQaItemsDetect01Mapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gs.xky.mapper.MesQaItemsDetect01Mapper">
+
+</mapper>
diff --git a/src/main/resources/mapper/MesQaItemsDetectDetail12Mapper.xml b/src/main/resources/mapper/MesQaItemsDetectDetail12Mapper.xml
new file mode 100644
index 0000000..ba360bd
--- /dev/null
+++ b/src/main/resources/mapper/MesQaItemsDetectDetail12Mapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gs.xky.mapper.MesQaItemsDetectDetail12Mapper">
+
+</mapper>
diff --git a/src/main/resources/mapper/MesQaItemsDetectDetail5Mapper.xml b/src/main/resources/mapper/MesQaItemsDetectDetail5Mapper.xml
new file mode 100644
index 0000000..66dc98d
--- /dev/null
+++ b/src/main/resources/mapper/MesQaItemsDetectDetail5Mapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gs.xky.mapper.MesQaItemsDetectDetail5Mapper">
+
+</mapper>
--
Gitblit v1.9.3