From 86c889c79c8c45f48acb19ed623beeafff688934 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期六, 15 二月 2025 08:36:36 +0800
Subject: [PATCH] 协客云的三个接口修改
---
src/main/java/com/gs/xky/service/Impl/TblBarcodeInformationServiceImpl.java | 26 +++++++++++++
src/main/java/com/gs/xky/entity/TblBarcodeInformation.java | 55 +++++++++++++++++++++++++--
src/main/java/com/gs/xky/dto/BarcodeDeliveryNo.java | 2
src/main/java/com/gs/xky/dto/DynamicData.java | 24 ++++++++++++
src/main/java/com/gs/xky/entity/DeliveryNotice.java | 5 +-
5 files changed, 105 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/gs/xky/dto/BarcodeDeliveryNo.java b/src/main/java/com/gs/xky/dto/BarcodeDeliveryNo.java
index 2909b0c..dcc8b7e 100644
--- a/src/main/java/com/gs/xky/dto/BarcodeDeliveryNo.java
+++ b/src/main/java/com/gs/xky/dto/BarcodeDeliveryNo.java
@@ -28,7 +28,7 @@
private String smallPackageSn; //褰撳墠灏忓寘鏉＄爜鐨勬祦姘寸爜
private String bigPackageSn; //褰撳墠澶у寘鏉＄爜鐨勬祦姘寸爜
private String outPackageSn; //褰撳墠澶栫鏉＄爜鐨勬祦姘寸爜
- //private String dynamicData; //鏉＄爜瑙勫垯涓搴旂殑鍔ㄦ�佸瓧娈电殑鍊�, key瀵瑰簲鐨勫彇鍊间负dynamicDescList.field鐨勫�硷紱濡傛灉浼佷笟璋冩暣浜嗘潯鐮佽鍒欙紝璇锋牴鎹甦ynamicDescList杩斿洖鐨勭粨鏋滐紝浜嗚В鍚勫姩鎬佹暟鎹殑鍚箟
+ private DynamicData dynamicData; //鏉＄爜瑙勫垯涓搴旂殑鍔ㄦ�佸瓧娈电殑鍊�, key瀵瑰簲鐨勫彇鍊间负dynamicDescList.field鐨勫�硷紱濡傛灉浼佷笟璋冩暣浜嗘潯鐮佽鍒欙紝璇锋牴鎹甦ynamicDescList杩斿洖鐨勭粨鏋滐紝浜嗚В鍚勫姩鎬佹暟鎹殑鍚箟
private String packLevel; //鍖呰灞傜骇
}
diff --git a/src/main/java/com/gs/xky/dto/DynamicData.java b/src/main/java/com/gs/xky/dto/DynamicData.java
new file mode 100644
index 0000000..04636e6
--- /dev/null
+++ b/src/main/java/com/gs/xky/dto/DynamicData.java
@@ -0,0 +1,24 @@
+package com.gs.xky.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DynamicData {
+
+ //閲囪喘鍗曞彿
+ private String poErpNo;
+ //椤圭洰(鍗曡韩extendN01)
+ private String extendN01;
+ //浜у搧缂栫爜
+ private String productCode;
+ //璁㈠崟椤规(ERP)
+ private String poLineNo;
+ //innerVendorCode
+ private String innerVendorCode;
+ //鐢熶骇鏃ユ湡
+ private String customize1;
+}
diff --git a/src/main/java/com/gs/xky/entity/DeliveryNotice.java b/src/main/java/com/gs/xky/entity/DeliveryNotice.java
index 420a5fd..4b34f17 100644
--- a/src/main/java/com/gs/xky/entity/DeliveryNotice.java
+++ b/src/main/java/com/gs/xky/entity/DeliveryNotice.java
@@ -1,6 +1,8 @@
package com.gs.xky.entity;
-import com.baomidou.mybatisplus.annotation.*;
+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;
@@ -13,7 +15,6 @@
*/
@TableName(value = "DELIVERY_NOTICE")
@Data
-@KeySequence(value = "SEQ_XKY", dbType = DbType.ORACLE)
public class DeliveryNotice implements Serializable {
@TableField(exist = false)
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/gs/xky/entity/TblBarcodeInformation.java b/src/main/java/com/gs/xky/entity/TblBarcodeInformation.java
index d7dd5c7..c043450 100644
--- a/src/main/java/com/gs/xky/entity/TblBarcodeInformation.java
+++ b/src/main/java/com/gs/xky/entity/TblBarcodeInformation.java
@@ -22,92 +22,139 @@
*/
@TableId
private Long id;
- /**
- * 閫佽揣鍗曞彿
- */
- private String deliveryNo;
+
/**
* 浜у搧缂栫爜
*/
private String productCode;
+
/**
* 灏忓寘鏉＄爜
*/
private String smallBarcode;
+
/**
* 澶у寘鏉＄爜
*/
private String bigBarcode;
+
/**
* 澶栫鏉＄爜
*/
private String outerBarcode;
+
/**
* 褰撳墠灏忓寘鏉＄爜鍖呭惈鐨勬暟閲�
*/
private String includeQty;
+
/**
* 灏忓寘鏉＄爜-闀�
*/
private String smallPackageLength;
+
/**
* 灏忓寘鏉＄爜-瀹�
*/
private String smallPackageWidth;
+
/**
* 灏忓寘鏉＄爜-楂�
*/
private String smallPackageHeight;
+
/**
* 澶у寘鏉＄爜-闀�
*/
private String bigPackageLength;
+
/**
* 澶у寘鏉＄爜-瀹�
*/
private String bigPackageWidth;
+
/**
* 澶у寘鏉＄爜-楂�
*/
private String bigPackageHeight;
+
/**
* 澶栫鏉＄爜-闀�
*/
private String outerPackageLength;
+
/**
* 澶栫鏉＄爜-瀹�
*/
private String outerPackageWidth;
+
/**
* 澶栫鏉＄爜-楂�
*/
private String outerPackageHeight;
+
/**
* 褰撳墠灏忓寘鏉＄爜鐨勬祦姘寸爜
*/
private String smallPackageSn;
+
/**
* 褰撳墠澶у寘鏉＄爜鐨勬祦姘寸爜
*/
private String bigPackageSn;
+
/**
* 褰撳墠澶栫鏉＄爜鐨勬祦姘寸爜
*/
private String outPackageSn;
+
/**
* 鏉＄爜瑙勫垯涓搴旂殑鍔ㄦ�佸瓧娈电殑鍊�
*/
private String dynamicData;
+
/**
* 鍖呰灞傜骇
*/
private String packLevel;
+
/**
* 鍒涘缓鏃堕棿
*/
private Date createTime;
+
/**
* 鏇存柊鏃堕棿
*/
private Date updateTime;
+
+ /**
+ * 閫佽揣鍗曞彿
+ */
+ private String deliveryNo;
+
+ /**
+ * 閲囪喘鍗曞彿
+ */
+ private String poErpNo;
+
+ /**
+ * 椤圭洰(鍗曡韩extendN01)
+ */
+ private String extendN01;
+
+ /**
+ * 璁㈠崟椤规(ERP)
+ */
+ private String poLineNo;
+
+ /**
+ * 渚涘簲鍟嗙紪鐮�
+ */
+ private String innerVendorCode;
+
+ /**
+ * 鐢熶骇鏃ユ湡
+ */
+ private String customize1;
}
\ No newline at end of file
diff --git a/src/main/java/com/gs/xky/service/Impl/TblBarcodeInformationServiceImpl.java b/src/main/java/com/gs/xky/service/Impl/TblBarcodeInformationServiceImpl.java
index 717955d..20f0e82 100644
--- a/src/main/java/com/gs/xky/service/Impl/TblBarcodeInformationServiceImpl.java
+++ b/src/main/java/com/gs/xky/service/Impl/TblBarcodeInformationServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gs.xky.dto.BarcodeDeliveryNo;
+import com.gs.xky.dto.DynamicData;
import com.gs.xky.entity.TblBarcodeInformation;
import com.gs.xky.mapper.TblBarcodeInformationMapper;
import com.gs.xky.service.TblBarcodeInformationService;
@@ -12,6 +13,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
@@ -40,6 +44,8 @@
for (BarcodeDeliveryNo barcodeDeliveryNo : barcodeList) {
+ DynamicData detail = barcodeDeliveryNo.getDynamicData();
+
updateWrapper.clear();
updateWrapper.eq(TblBarcodeInformation::getSmallBarcode, barcodeDeliveryNo.getSmallBarcode());
remove(updateWrapper);
@@ -49,6 +55,26 @@
barcodeInformation.setDeliveryNo(deliveryNo);
+// String[] split = detail.getPoLineNo().split("-");
+// barcodeInformation.setPoLineNo(split[0]);
+ barcodeInformation.setExtendN01(detail.getExtendN01());
+
+ barcodeInformation.setPoErpNo(detail.getPoErpNo());
+ barcodeInformation.setInnerVendorCode(detail.getInnerVendorCode());
+
+ long timestamp = Long.parseLong(detail.getCustomize1());
+ // 灏嗘椂闂存埑杞崲涓篒nstant瀵硅薄
+ Instant instant = Instant.ofEpochMilli(timestamp);
+
+ // 鍒涘缓DateTimeFormatter瀹炰緥锛屾寚瀹氭牸寮�
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
+ .withZone(ZoneId.systemDefault());
+
+ // 鏍煎紡鍖栦负瀛楃涓�
+ String formattedDate = formatter.format(instant);
+
+ barcodeInformation.setCustomize1(formattedDate);
+
tbBarcodeInformationList.add(barcodeInformation);
}
--
Gitblit v1.9.3