From 6d451494073276a7fa2b38f07c40d16f5c09af68 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期六, 15 二月 2025 17:49:20 +0800
Subject: [PATCH] 撤回流程的补充
---
src/main/resources/mapper/MesInvItemBarcodesMapper.xml | 7
src/main/java/com/gs/xky/mapper/MesInvItemArnDetailMapper.java | 18 +
src/main/java/com/gs/xky/mapper/MesInvItemArnMapper.java | 18 +
src/main/java/com/gs/xky/entity/MesInvItemArnDetail.java | 196 +++++++++++
src/main/java/com/gs/xky/mapper/MesInvItemBarcodesMapper.java | 18 +
src/main/java/com/gs/xky/service/Impl/MesInvItemArnServiceImpl.java | 22 +
src/main/java/com/gs/xky/service/MesInvItemBarcodesService.java | 13
src/main/java/com/gs/xky/entity/MesInvItemBarcodes.java | 382 ++++++++++++++++++++++
src/main/java/com/gs/xky/service/MesInvItemArnDetailService.java | 13
src/main/java/com/gs/xky/service/Impl/MesInvItemArnDetailServiceImpl.java | 22 +
src/main/java/com/gs/xky/service/XkyService.java | 72 ++-
src/main/java/com/gs/xky/entity/MesInvItemArn.java | 178 ++++++++++
src/main/resources/mapper/MesInvItemArnMapper.xml | 7
src/main/java/com/gs/xky/service/MesInvItemArnService.java | 13
src/main/resources/mapper/MesInvItemArnDetailMapper.xml | 7
src/main/java/com/gs/xky/service/Impl/MesInvItemBarcodesServiceImpl.java | 22 +
16 files changed, 985 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/gs/xky/entity/MesInvItemArn.java b/src/main/java/com/gs/xky/entity/MesInvItemArn.java
new file mode 100644
index 0000000..76b9a9d
--- /dev/null
+++ b/src/main/java/com/gs/xky/entity/MesInvItemArn.java
@@ -0,0 +1,178 @@
+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;
+
+/**
+ * 鐗╂枡鍏ュ簱涓昏〃
+ *
+ * @TableName MES_INV_ITEM_ARN
+ */
+@TableName(value = "MES_INV_ITEM_ARN")
+@Data
+public class MesInvItemArn implements Serializable {
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+ /**
+ * ID(SEQ_INV_ID)
+ */
+ @TableId
+ private Long id;
+ /**
+ * 鍒拌揣鍗曞彿
+ */
+ private String billNo;
+ /**
+ * 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴
+ */
+ private Integer status;
+ /**
+ * 鍘熷洜
+ */
+ private String reason;
+ /**
+ * 鍒涘缓浜�
+ */
+ private String createBy;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private Date createDate;
+ /**
+ * 鏈�鍚庢洿鏂颁汉
+ */
+ private String lastupdateBy;
+ /**
+ * 鏈�鍚庢洿鏂版椂闂�
+ */
+ private Date lastupdateDate;
+ /**
+ * 鍗曟嵁绫诲瀷ID
+ */
+ private Long billTypeId;
+ /**
+ * 浜嬪姟绫诲瀷ID
+ */
+ private Long transactionId;
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+ /**
+ * 閫佽揣鍗曞彿
+ */
+ private String paperBillNo;
+ /**
+ * 閫�鏂欎汉宸ュ彿
+ */
+ private String userNoBack;
+ /**
+ * 鎻愪氦浜�
+ */
+ private String checkUser;
+ /**
+ * 鎻愪氦鏃ユ湡
+ */
+ private Date checkDate;
+ /**
+ * 鍏ュ簱鏃ユ湡
+ */
+ private Date insDate;
+ /**
+ * 妫�楠岀粨鏋�
+ */
+ private String checkRes;
+ /**
+ * 宸叉崱鏁伴噺
+ */
+ private Long checkQty;
+ /**
+ * 浠撳簱缂栫爜
+ */
+ private String depotsCode;
+ /**
+ * 浜嬪姟绫诲瀷缂栫爜
+ */
+ private String transctionNo;
+ /**
+ * 渚涘簲鍟嗙紪鐮�
+ */
+ private String suppNo;
+ /**
+ * 鎻愪氦鐘舵��
+ */
+ private Integer fstatus;
+ /**
+ * 宸ュ巶缂栫爜
+ */
+ private String factory;
+ /**
+ * 鏄惁宸插洖鍐橲AP
+ */
+ private Integer sapstatus;
+ /**
+ * 纭鍏ュ簱鏃ユ湡
+ */
+ private Date insdate;
+ /**
+ * 鏄惁妫�楠�
+ */
+ private Long ischeck;
+ /**
+ * 瀹℃牳鍏ュ簱浜�
+ */
+ private String insby;
+ /**
+ * 鍏徃浠ｇ爜
+ */
+ private String company;
+ /**
+ * 鎬ユ枡鏍囪瘑
+ */
+ private Integer urgentFlag;
+ /**
+ * 鍐查攢浜嬪姟绫诲瀷缂栫爜
+ */
+ private Long mttransctionNo;
+ /**
+ * IQC妫�楠屽崟鍙�
+ */
+ private String iqcReleaseNo;
+ /**
+ * 鏄惁鏄剧ず
+ */
+ private Long isVisual;
+ /**
+ * 0=閲囪喘锛�1=濮斿
+ */
+ private Long fType;
+ /**
+ * ERP鍒拌揣鍗旾D
+ */
+ private String ebelnK3id;
+ /**
+ * 鏉＄爜鏉″嵃杩涘害
+ */
+ private Long barcodeRatio;
+ /**
+ * ERP鍗曞彿
+ */
+ private String erpno;
+ /**
+ * 鏄惁宸查��璐�0-鏈��璐э紝1-閫�璐�
+ */
+ private Integer thstatus;
+ /**
+ * ERP閫�璐у崟鍙�
+ */
+ private String erpthno;
+ /**
+ * 缁勭粐缂栫爜
+ */
+ private String organizeCode;
+}
\ No newline at end of file
diff --git a/src/main/java/com/gs/xky/entity/MesInvItemArnDetail.java b/src/main/java/com/gs/xky/entity/MesInvItemArnDetail.java
new file mode 100644
index 0000000..b47bea0
--- /dev/null
+++ b/src/main/java/com/gs/xky/entity/MesInvItemArnDetail.java
@@ -0,0 +1,196 @@
+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;
+
+/**
+ * @TableName MES_INV_ITEM_ARN_DETAIL
+ */
+@TableName(value = "MES_INV_ITEM_ARN_DETAIL")
+@Data
+public class MesInvItemArnDetail implements Serializable {
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+ /**
+ * SEQ_INV_ID
+ */
+ @TableId
+ private Long id;
+ /**
+ * 涓昏〃ID
+ */
+ private Long mid;
+ /**
+ * 閲囪喘鍗曞彿
+ */
+ private String ebeln;
+ /**
+ * 閲囪喘璁㈠崟琛屽彿
+ */
+ private Long ebelnLine;
+ /**
+ * 閲囪喘璁㈠崟鏁伴噺
+ */
+ private Long ebelnQty;
+ /**
+ * 鐗╂枡缂栫爜
+ */
+ private String itemNo;
+ /**
+ * 鏀惰揣鏁伴噺
+ */
+ private Long quantity;
+ /**
+ * 鍒涘缓浜�
+ */
+ private String createBy;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private Date createDate;
+ /**
+ * 鏈�鍚庢洿鏂颁汉
+ */
+ private String lastupdateBy;
+ /**
+ * 鏈�鍚庢洿鏂版椂闂�
+ */
+ private Date lastupdateDate;
+ /**
+ * 鍒嗗巶缂栫爜
+ */
+ private String factory;
+ /**
+ * 鍏徃浠ｇ爜
+ */
+ private String company;
+ /**
+ * 閲囪喘鍗旾D
+ */
+ private Long ebelnK3id;
+ /**
+ * 閲囪喘鍗曡ID
+ */
+ private Long lineK3id;
+ /**
+ * 鏈搴旀敹鏁伴噺
+ */
+ private Long subQty;
+ /**
+ * 浣欓噺
+ */
+ private Long marginQty;
+ /**
+ * 浠诲姟鍗曞彿
+ */
+ private String workNo;
+ /**
+ * 鎬ユ枡鏍囪瘑
+ */
+ private Long urgentFlag;
+ /**
+ * 澶囨敞
+ */
+ private String memo;
+ /**
+ * 妫�楠岀粨鏋�
+ */
+ private String checkRes;
+ /**
+ * 妫�楠岀姸鎬� 锛堝緟妫�銆佸垎閫夈�佺壒閲囥�佸凡妫�锛�
+ */
+ private String checkStates;
+ /**
+ * 鏀惰揣浣欓噺
+ */
+ private Long quantityM;
+ /**
+ * 鏈搴旀敹浣欓噺
+ */
+ private Long subMqty;
+ /**
+ * 妫�楠屾棩鏈�
+ */
+ private Date checkDate;
+ /**
+ * 鏄惁妫�楠�
+ */
+ private Integer ischeck;
+ /**
+ * 宸叉敹鏁伴噺
+ */
+ private Long okQty;
+ /**
+ * 宸叉敹浣欓噺
+ */
+ private Long okMqty;
+ /**
+ * 浜у搧鍨嬪彿
+ */
+ private String boardStyle;
+ /**
+ * 浠诲姟鍗曡鍙�
+ */
+ private Long workLine;
+ /**
+ * 0銆侀噰璐崟锛�1銆佸澶栧崟
+ */
+ private Long fType;
+ /**
+ * 鏄惁鍏ュ簱
+ */
+ private Integer isdepsIn;
+ /**
+ * 鍒拌揣鍗曞彿
+ */
+ private String dha001;
+ /**
+ * 宸插叆搴撴暟閲�
+ */
+ private Long okRkqty;
+ /**
+ * 鍒拌揣鍗曞彿
+ */
+ private String cbillNo;
+ /**
+ * 閲囪喘鍏ュ簱鏁伴噺
+ */
+ private Long cgRkqty;
+ /**
+ * 鐗╂枡ID
+ */
+ private Long itemId;
+ /**
+ * 閫�璐ф爣璇�
+ */
+ private Long returnFlag;
+ /**
+ * 閿�鍞鍗曞彿
+ */
+ private String salesOrder;
+ /**
+ * 涓撶敤鐗╂枡鏍囪瘑
+ */
+ private Long isZy;
+ /**
+ * 鍏ュ簱瀹屾垚鏃堕棿
+ */
+ private Date rkDate;
+ /**
+ * 璁″垝璺熻釜鍙�
+ */
+ private String fmtono;
+ /**
+ * 渚涘崗鍗曞彿
+ */
+ private String deliveryNo;
+ /**
+ * 渚涘崗鍒嗗綍鍐呯爜
+ */
+ private Long deliveryLine;
+}
\ No newline at end of file
diff --git a/src/main/java/com/gs/xky/entity/MesInvItemBarcodes.java b/src/main/java/com/gs/xky/entity/MesInvItemBarcodes.java
new file mode 100644
index 0000000..78bf248
--- /dev/null
+++ b/src/main/java/com/gs/xky/entity/MesInvItemBarcodes.java
@@ -0,0 +1,382 @@
+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;
+
+/**
+ * 鐗╂枡鏉＄爜琛�
+ *
+ * @TableName MES_INV_ITEM_BARCODES
+ */
+@TableName(value = "MES_INV_ITEM_BARCODES")
+@Data
+public class MesInvItemBarcodes implements Serializable {
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+ /**
+ * SEQ_BARCODE_PSN_ID
+ */
+ @TableId
+ private Long id;
+ /**
+ * 鐗╂枡鏉＄爜
+ */
+ private String itemBarcode;
+ /**
+ * 瀹㈡埛鎴愬搧缂栫爜
+ */
+ private String cProductCode;
+ /**
+ * 瀹㈡埛鐗╂枡鏉＄爜
+ */
+ private String cItemBarcode;
+ /**
+ * 瀹㈡埛鐗╂枡缂栫爜
+ */
+ private String cItemCode;
+ /**
+ * 鏈徃鐗╂枡缂栫爜
+ */
+ private String itemNo;
+ /**
+ * 鍘傚鎵规
+ */
+ private String lotNo;
+ /**
+ * 鏁伴噺
+ */
+ private Long quantity;
+ /**
+ * 鏄惁鐜繚(0:鍚�,1:鏄�)
+ */
+ private Integer epFlag;
+ /**
+ * 鐢熶骇宸ュ崟
+ */
+ private String taskNo;
+ /**
+ * 鍒涘缓浜�
+ */
+ private String createBy;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private Date createDate;
+ /**
+ * 鏈�鍚庢洿鏂颁汉
+ */
+ private String lastupdateBy;
+ /**
+ * 鏈�鍚庢洿鏂版椂闂�
+ */
+ private Date lastupdateDate;
+ /**
+ * 瀹㈡埛缂栧彿
+ */
+ private String custNo;
+ /**
+ * 鐗╂枡鏉＄爜娉ㄩ噴琛孾鍐椾綑锛屾潯鐮侀噸鎵撲娇鐢╙
+ */
+ private String itemBarcodeText;
+ /**
+ * 鍘烶SN鐗╂枡鏉＄爜
+ */
+ private String oldItemBarcode;
+ /**
+ * SAP鏀惰揣鐗╂枡鍑瘉鍙� --閲囪喘鍗曞彿
+ */
+ private String mblnr;
+ /**
+ * SAP鏀惰揣鐗╂枡鍑瘉琛屽彿 --閲囪喘鍗曡鍙�
+ */
+ private Long zeile;
+ /**
+ * 鏀舵枡琛↖D
+ */
+ private Long rohInId;
+ /**
+ * 0涓烘湁鏁堟潯鐮侊紱1涓烘棤鏁堟潯鐮�
+ */
+ private Integer barcodestatus;
+ /**
+ * 鍘熷鏁伴噺
+ */
+ private Long oldqty;
+ /**
+ * 浣跨敤鏁伴噺
+ */
+ private Long useqty;
+ /**
+ * 0鍦ㄥ簱锛�1鍦ㄧ嚎锛�2浣滃簾
+ */
+ private Integer location;
+ /**
+ * 鍗曚綅
+ */
+ private String unit;
+ /**
+ * 閲嶉噺锛堝崟浣嶏細鍏枻锛�
+ */
+ private Long weightUnit;
+ /**
+ * 鍗曚环
+ */
+ private Long price;
+ /**
+ * 鍘熸潯鐮佹暟閲�
+ */
+ private Long oldBarQuantity;
+ /**
+ * 姹囨�绘潯鐮�
+ */
+ private String sumBarcode;
+ /**
+ * 鐢熶骇鏃ユ湡
+ */
+ private String lotDate;
+ /**
+ * 妯″彿
+ */
+ private String mocode;
+ /**
+ * 鏉ユ簮
+ */
+ private String memo;
+ /**
+ * 渚涘簲鍟嗙紪鐮�
+ */
+ private String suppNo;
+ /**
+ * 妗ｄ綅浣庡��
+ */
+ private String spostion;
+ /**
+ * 妗ｄ綅楂樺��
+ */
+ private String epostion;
+ /**
+ * 鐗╂枡绠�绉�
+ */
+ private String itemSname;
+ /**
+ * 鏄惁宸插喕缁�,1鍐荤粨
+ */
+ private Integer visable;
+ /**
+ * 渚涘簲鍟嗘壒娆�
+ */
+ private String trLotno;
+ /**
+ * 鍐荤粨鏃堕棿
+ */
+ private Date flezzDate;
+ /**
+ * 鍐荤粨鍘熷洜
+ */
+ private String flezzReason;
+ /**
+ * 鍐荤粨浜�
+ */
+ private String flezzBy;
+ /**
+ * 寤堕暱淇濊川鏈�
+ */
+ private Long delanyMonth;
+ /**
+ * 鏈�灏忓寘瑁呮爣璇�
+ */
+ private Integer minpackFlag;
+ /**
+ * 鎵撳嵃ID锛岀敤鏉ュ尯鍒嗘墦鍗版鏁�
+ */
+ private String printId;
+ /**
+ * 鐜繚椤圭洰
+ */
+ private String epItem;
+ /**
+ * 宸ュ巶缂栧彿
+ */
+ private String factory;
+ /**
+ * 鍏徃缂栧彿
+ */
+ private String company;
+ /**
+ * 鍗℃澘缂栫爜
+ */
+ private String cbNo;
+ /**
+ * 鍘傚鐢熶骇绾�
+ */
+ private String linfline;
+ /**
+ * 鏈夋晥鏈�
+ */
+ private Date validTime;
+ /**
+ * 璐ㄦ缁撴灉
+ */
+ private String iqcStatus;
+ /**
+ * 灏忚溅鏉＄爜
+ */
+ private String fcar;
+ /**
+ * 姣涢噸
+ */
+ private String gweight;
+ /**
+ * 鍑�閲�
+ */
+ private String nweight;
+ /**
+ * 淇濊川鏈�
+ */
+ private Long extDate;
+ /**
+ * 渚涘簲鍟嗐�佽禒鍝併�佸渚涙枡銆佸澶�
+ */
+ private String barcodetype;
+ /**
+ * 渚涘簲鍟嗗悕绉�
+ */
+ private String suppName;
+ /**
+ * 鍒拌揣鍗曞彿/鍏ュ簱鍗曞彿
+ */
+ private String billNo;
+ /**
+ * 鎬ユ枡鏍囪瘑
+ */
+ private Integer urgentFlag;
+ /**
+ * 棰滆壊
+ */
+ private String colorName;
+ /**
+ * 浜у搧鍨嬪彿
+ */
+ private String boardStyle;
+ /**
+ * 鏉ユ枡鏃ユ湡
+ */
+ private Date insDate;
+ /**
+ * 鍒拌揣鍗曡鍙�
+ */
+ private Long workLine;
+ /**
+ * 涓嶈壇鍘熷洜
+ */
+ private String memoBad;
+ /**
+ * 浠诲姟鍗曞彿
+ */
+ private String workNo;
+ /**
+ * 鏉＄爜鏉ユ簮鏍囪瘑锛�0-鍒濇湡鐗╂枡,1-閲囪喘鍏ュ簱锛�2銆佺敓浜ч��鏂欙紝3銆佸叾瀹冨叆搴擄紝4-瀹緵鏂�,5-鍦ㄥ簱鍒嗘枡锛�6-鍒剁▼鏉＄爜
+ */
+ private Integer comeFlg;
+ /**
+ * 鐢熶骇绾夸綋
+ */
+ private String lineNo;
+ /**
+ * 涓濆嵃娆℃暟
+ */
+ private Long silkPqty;
+ /**
+ * 涓濆嵃娆℃暟姣�
+ */
+ private String silk;
+ /**
+ * 涓濆嵃娲惧伐浠庤〃ID
+ */
+ private Long silkId;
+ /**
+ * 宸叉姤宸ユ爣璇�
+ */
+ private Long workFlg;
+ /**
+ * 鏈�鍚庡伐搴�
+ */
+ private Long workLast;
+ /**
+ * 0-鏈悎骞舵墦鍗帮紝1-鍚堝苟鎵撳嵃
+ */
+ private Long hbdy;
+ /**
+ * 0-鏈夋晥鏉＄爜锛�1-鍚堝苟鎷嗗垎鐨勬潯鐮侊紝鏃犳晥
+ */
+ private Long hbdytm;
+ /**
+ * 鎶ュ伐鏃堕棿
+ */
+ private String workFlgtime;
+ /**
+ * 閲囪喘璁㈠崟ID
+ */
+ private Long ebelnK3id;
+ /**
+ * 閲囪喘璁㈠崟琛孖D
+ */
+ private Long lineK3id;
+ /**
+ * 鐗╂枡id
+ */
+ private Long itemId;
+ /**
+ * 鐢熶骇宸ュ簭ID
+ */
+ private Long gxId;
+ /**
+ * 缁勭粐id
+ */
+ private String orgName;
+ /**
+ * 璐т富id
+ */
+ private String orgOwner;
+ /**
+ * 閿�鍞鍗�
+ */
+ private String salesOrder;
+ /**
+ * 鏄惁涓撶敤
+ */
+ private Long isZy;
+ /**
+ * 鍏ュ簱鏍囪瘑
+ */
+ private Long rkFlg;
+ /**
+ * 闇�姹傚崟鎹彿
+ */
+ private String caa015;
+ /**
+ * 鍗曚綅id
+ */
+ private Long itemUnit;
+ /**
+ * 璁″垝璺熻釜鍙�
+ */
+ private String fmtono;
+ /**
+ * 渚涘崗鍗曞彿
+ */
+ private String deliveryNo;
+ /**
+ * 渚涘崗鍒嗗綍鍐呯爜
+ */
+ private Long deliveryLine;
+ /**
+ * 绠辨潯鐮�
+ */
+ private String outerBarcode;
+}
\ No newline at end of file
diff --git a/src/main/java/com/gs/xky/mapper/MesInvItemArnDetailMapper.java b/src/main/java/com/gs/xky/mapper/MesInvItemArnDetailMapper.java
new file mode 100644
index 0000000..fa58444
--- /dev/null
+++ b/src/main/java/com/gs/xky/mapper/MesInvItemArnDetailMapper.java
@@ -0,0 +1,18 @@
+package com.gs.xky.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gs.xky.entity.MesInvItemArnDetail;
+
+/**
+ * @author 28567
+ * @description 閽堝琛ㄣ�怣ES_INV_ITEM_ARN_DETAIL銆戠殑鏁版嵁搴撴搷浣淢apper
+ * @createDate 2025-02-15 17:10:14
+ * @Entity com.gs.xky.entity.MesInvItemArnDetail
+ */
+public interface MesInvItemArnDetailMapper extends BaseMapper<MesInvItemArnDetail> {
+
+}
+
+
+
+
diff --git a/src/main/java/com/gs/xky/mapper/MesInvItemArnMapper.java b/src/main/java/com/gs/xky/mapper/MesInvItemArnMapper.java
new file mode 100644
index 0000000..14cd385
--- /dev/null
+++ b/src/main/java/com/gs/xky/mapper/MesInvItemArnMapper.java
@@ -0,0 +1,18 @@
+package com.gs.xky.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gs.xky.entity.MesInvItemArn;
+
+/**
+ * @author 28567
+ * @description 閽堝琛ㄣ�怣ES_INV_ITEM_ARN(鐗╂枡鍏ュ簱涓昏〃)銆戠殑鏁版嵁搴撴搷浣淢apper
+ * @createDate 2025-02-15 17:10:09
+ * @Entity com.gs.xky.entity.MesInvItemArn
+ */
+public interface MesInvItemArnMapper extends BaseMapper<MesInvItemArn> {
+
+}
+
+
+
+
diff --git a/src/main/java/com/gs/xky/mapper/MesInvItemBarcodesMapper.java b/src/main/java/com/gs/xky/mapper/MesInvItemBarcodesMapper.java
new file mode 100644
index 0000000..ef3bb7f
--- /dev/null
+++ b/src/main/java/com/gs/xky/mapper/MesInvItemBarcodesMapper.java
@@ -0,0 +1,18 @@
+package com.gs.xky.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gs.xky.entity.MesInvItemBarcodes;
+
+/**
+ * @author 28567
+ * @description 閽堝琛ㄣ�怣ES_INV_ITEM_BARCODES(鐗╂枡鏉＄爜琛�)銆戠殑鏁版嵁搴撴搷浣淢apper
+ * @createDate 2025-02-15 17:10:23
+ * @Entity com.gs.xky.entity.MesInvItemBarcodes
+ */
+public interface MesInvItemBarcodesMapper extends BaseMapper<MesInvItemBarcodes> {
+
+}
+
+
+
+
diff --git a/src/main/java/com/gs/xky/service/Impl/MesInvItemArnDetailServiceImpl.java b/src/main/java/com/gs/xky/service/Impl/MesInvItemArnDetailServiceImpl.java
new file mode 100644
index 0000000..8a80eee
--- /dev/null
+++ b/src/main/java/com/gs/xky/service/Impl/MesInvItemArnDetailServiceImpl.java
@@ -0,0 +1,22 @@
+package com.gs.xky.service.Impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gs.xky.entity.MesInvItemArnDetail;
+import com.gs.xky.mapper.MesInvItemArnDetailMapper;
+import com.gs.xky.service.MesInvItemArnDetailService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author 28567
+ * @description 閽堝琛ㄣ�怣ES_INV_ITEM_ARN_DETAIL銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+ * @createDate 2025-02-15 17:10:14
+ */
+@Service
+public class MesInvItemArnDetailServiceImpl extends ServiceImpl<MesInvItemArnDetailMapper, MesInvItemArnDetail>
+ implements MesInvItemArnDetailService {
+
+}
+
+
+
+
diff --git a/src/main/java/com/gs/xky/service/Impl/MesInvItemArnServiceImpl.java b/src/main/java/com/gs/xky/service/Impl/MesInvItemArnServiceImpl.java
new file mode 100644
index 0000000..f323c3f
--- /dev/null
+++ b/src/main/java/com/gs/xky/service/Impl/MesInvItemArnServiceImpl.java
@@ -0,0 +1,22 @@
+package com.gs.xky.service.Impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gs.xky.entity.MesInvItemArn;
+import com.gs.xky.mapper.MesInvItemArnMapper;
+import com.gs.xky.service.MesInvItemArnService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author 28567
+ * @description 閽堝琛ㄣ�怣ES_INV_ITEM_ARN(鐗╂枡鍏ュ簱涓昏〃)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+ * @createDate 2025-02-15 17:10:09
+ */
+@Service
+public class MesInvItemArnServiceImpl extends ServiceImpl<MesInvItemArnMapper, MesInvItemArn>
+ implements MesInvItemArnService {
+
+}
+
+
+
+
diff --git a/src/main/java/com/gs/xky/service/Impl/MesInvItemBarcodesServiceImpl.java b/src/main/java/com/gs/xky/service/Impl/MesInvItemBarcodesServiceImpl.java
new file mode 100644
index 0000000..396aa00
--- /dev/null
+++ b/src/main/java/com/gs/xky/service/Impl/MesInvItemBarcodesServiceImpl.java
@@ -0,0 +1,22 @@
+package com.gs.xky.service.Impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gs.xky.entity.MesInvItemBarcodes;
+import com.gs.xky.mapper.MesInvItemBarcodesMapper;
+import com.gs.xky.service.MesInvItemBarcodesService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author 28567
+ * @description 閽堝琛ㄣ�怣ES_INV_ITEM_BARCODES(鐗╂枡鏉＄爜琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+ * @createDate 2025-02-15 17:10:23
+ */
+@Service
+public class MesInvItemBarcodesServiceImpl extends ServiceImpl<MesInvItemBarcodesMapper, MesInvItemBarcodes>
+ implements MesInvItemBarcodesService {
+
+}
+
+
+
+
diff --git a/src/main/java/com/gs/xky/service/MesInvItemArnDetailService.java b/src/main/java/com/gs/xky/service/MesInvItemArnDetailService.java
new file mode 100644
index 0000000..285ecd7
--- /dev/null
+++ b/src/main/java/com/gs/xky/service/MesInvItemArnDetailService.java
@@ -0,0 +1,13 @@
+package com.gs.xky.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gs.xky.entity.MesInvItemArnDetail;
+
+/**
+ * @author 28567
+ * @description 閽堝琛ㄣ�怣ES_INV_ITEM_ARN_DETAIL銆戠殑鏁版嵁搴撴搷浣淪ervice
+ * @createDate 2025-02-15 17:10:14
+ */
+public interface MesInvItemArnDetailService extends IService<MesInvItemArnDetail> {
+
+}
diff --git a/src/main/java/com/gs/xky/service/MesInvItemArnService.java b/src/main/java/com/gs/xky/service/MesInvItemArnService.java
new file mode 100644
index 0000000..e0f2b64
--- /dev/null
+++ b/src/main/java/com/gs/xky/service/MesInvItemArnService.java
@@ -0,0 +1,13 @@
+package com.gs.xky.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gs.xky.entity.MesInvItemArn;
+
+/**
+ * @author 28567
+ * @description 閽堝琛ㄣ�怣ES_INV_ITEM_ARN(鐗╂枡鍏ュ簱涓昏〃)銆戠殑鏁版嵁搴撴搷浣淪ervice
+ * @createDate 2025-02-15 17:10:09
+ */
+public interface MesInvItemArnService extends IService<MesInvItemArn> {
+
+}
diff --git a/src/main/java/com/gs/xky/service/MesInvItemBarcodesService.java b/src/main/java/com/gs/xky/service/MesInvItemBarcodesService.java
new file mode 100644
index 0000000..5f6efad
--- /dev/null
+++ b/src/main/java/com/gs/xky/service/MesInvItemBarcodesService.java
@@ -0,0 +1,13 @@
+package com.gs.xky.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gs.xky.entity.MesInvItemBarcodes;
+
+/**
+ * @author 28567
+ * @description 閽堝琛ㄣ�怣ES_INV_ITEM_BARCODES(鐗╂枡鏉＄爜琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice
+ * @createDate 2025-02-15 17:10:23
+ */
+public interface MesInvItemBarcodesService extends IService<MesInvItemBarcodes> {
+
+}
diff --git a/src/main/java/com/gs/xky/service/XkyService.java b/src/main/java/com/gs/xky/service/XkyService.java
index 29755dd..558e20f 100644
--- a/src/main/java/com/gs/xky/service/XkyService.java
+++ b/src/main/java/com/gs/xky/service/XkyService.java
@@ -1,6 +1,7 @@
package com.gs.xky.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.gs.xky.config.ApiResponse;
import com.gs.xky.config.BodyParam;
@@ -9,9 +10,7 @@
import com.gs.xky.dto.BarcodeDeliveryNo;
import com.gs.xky.dto.XkyDetail;
import com.gs.xky.dto.XkyEntity;
-import com.gs.xky.entity.DeliveryNotice;
-import com.gs.xky.entity.DeliveryNoticeDetail;
-import com.gs.xky.entity.TblBarcodeInformation;
+import com.gs.xky.entity.*;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +30,10 @@
private final TblBarcodeInformationService barcodeInformationService;
private final DeliveryNoticeDetailService deliveryNoticeDetailService;
+
+ private final MesInvItemArnService mesInvItemArnService;
+ private final MesInvItemArnDetailService mesInvItemArnDetailService;
+ private final MesInvItemBarcodesService mesInvItemBarcodesService;
public void GetSaveDetail() throws IOException {
long currentTimeMillis = System.currentTimeMillis();
@@ -56,31 +59,12 @@
List<XkyEntity> deliveryNoList = noList.getDataList();
- LambdaUpdateWrapper<DeliveryNotice> deliveryNoticeWrapper = new LambdaUpdateWrapper<>();
-
- LambdaUpdateWrapper<DeliveryNoticeDetail> updateWrapper = new LambdaUpdateWrapper<>();
-
- LambdaUpdateWrapper<TblBarcodeInformation> updateWrapper1 = new LambdaUpdateWrapper<>();
-
deliveryNoList.forEach(deliveryNo -> {
try {
if ("6".equals(deliveryNo.getStatus()) || "0".equals(deliveryNo.getLogisticsStatus())) {
- deliveryNoticeWrapper.clear();
- updateWrapper.clear();
- updateWrapper1.clear();
- deliveryNoticeWrapper.eq(DeliveryNotice::getDeliveryNo, deliveryNo.getDeliveryNo());
- DeliveryNotice one = deliveryNoticeService.getOne(deliveryNoticeWrapper, false);
-
- if (deliveryNoticeService.remove(deliveryNoticeWrapper)) {
-
- updateWrapper.eq(DeliveryNoticeDetail::getPid, one.getId());
- deliveryNoticeDetailService.remove(updateWrapper);
-
- updateWrapper1.eq(TblBarcodeInformation::getDeliveryNo, deliveryNo.getDeliveryNo());
- barcodeInformationService.remove(updateWrapper1);
- }
+ remove(deliveryNo);
} else if ("2".equals(deliveryNo.getLogisticsStatus())) {
XkyDetail detail = getDetail(deliveryNo.getDeliveryNo());
@@ -97,6 +81,48 @@
});
}
+ private void remove(XkyEntity deliveryNo) {
+ LambdaUpdateWrapper<DeliveryNotice> deliveryNoticeWrapper = new LambdaUpdateWrapper<>();
+
+ deliveryNoticeWrapper.eq(DeliveryNotice::getDeliveryNo, deliveryNo.getDeliveryNo());
+
+ DeliveryNotice one = deliveryNoticeService.getOne(deliveryNoticeWrapper, false);
+
+ if (deliveryNoticeService.remove(deliveryNoticeWrapper)) {
+
+ LambdaUpdateWrapper<DeliveryNoticeDetail> updateWrapper = new LambdaUpdateWrapper<>();
+
+ updateWrapper.eq(DeliveryNoticeDetail::getPid, one.getId());
+
+ deliveryNoticeDetailService.remove(updateWrapper);
+
+ LambdaUpdateWrapper<TblBarcodeInformation> updateWrapper1 = new LambdaUpdateWrapper<>();
+
+ updateWrapper1.eq(TblBarcodeInformation::getDeliveryNo, deliveryNo.getDeliveryNo());
+
+ barcodeInformationService.remove(updateWrapper1);
+
+ LambdaQueryWrapper<MesInvItemArn> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(MesInvItemArn::getPaperBillNo, deliveryNo.getDeliveryNo());
+
+ mesInvItemArnService.remove(wrapper);
+
+ MesInvItemArn mesInvItemArn = mesInvItemArnService.getOne(wrapper, false);
+ if (mesInvItemArn != null) {
+ LambdaUpdateWrapper<MesInvItemArnDetail> updateWrapper2 = new LambdaUpdateWrapper<>();
+
+ updateWrapper2.eq(MesInvItemArnDetail::getMid, mesInvItemArn.getId());
+ mesInvItemArnDetailService.remove(updateWrapper2);
+
+ LambdaUpdateWrapper<MesInvItemBarcodes> updateWrapper3 = new LambdaUpdateWrapper<>();
+
+ updateWrapper3.eq(MesInvItemBarcodes::getBillNo, mesInvItemArn.getBillNo());
+ mesInvItemBarcodesService.remove(updateWrapper3);
+
+ }
+ }
+ }
+
private XkyDetail getDetail(String deliveryNo) throws IOException {
XkyCommonParam param = XkyCommonParam.GetInit();
diff --git a/src/main/resources/mapper/MesInvItemArnDetailMapper.xml b/src/main/resources/mapper/MesInvItemArnDetailMapper.xml
new file mode 100644
index 0000000..bad7565
--- /dev/null
+++ b/src/main/resources/mapper/MesInvItemArnDetailMapper.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.MesInvItemArnDetailMapper">
+
+</mapper>
diff --git a/src/main/resources/mapper/MesInvItemArnMapper.xml b/src/main/resources/mapper/MesInvItemArnMapper.xml
new file mode 100644
index 0000000..43a618c
--- /dev/null
+++ b/src/main/resources/mapper/MesInvItemArnMapper.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.MesInvItemArnMapper">
+
+</mapper>
diff --git a/src/main/resources/mapper/MesInvItemBarcodesMapper.xml b/src/main/resources/mapper/MesInvItemBarcodesMapper.xml
new file mode 100644
index 0000000..5706b84
--- /dev/null
+++ b/src/main/resources/mapper/MesInvItemBarcodesMapper.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.MesInvItemBarcodesMapper">
+
+</mapper>
--
Gitblit v1.9.3