From a5ea6c16ddee126361a325ebd25d9136c0cc5b75 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 10 八月 2023 12:07:38 +0800
Subject: [PATCH] 优化3.5版本库存更新
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java | 52 ++++++----------
src/main/java/com/fzzy/async/fzzy35/entity/Fz35DepotStore.java | 110 ++++++++++++++++++++++++++++++++++++
src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1208Rep.java | 9 +-
3 files changed, 135 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/Fz35DepotStore.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35DepotStore.java
new file mode 100644
index 0000000..57e70d2
--- /dev/null
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35DepotStore.java
@@ -0,0 +1,110 @@
+package com.fzzy.async.fzzy35.entity;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Desc: 绮搴撳瓨绠＄悊锛屾牴鎹浗鏍囨爣缁撴灉瑕佹眰鍒涘缓
+ * @author: Andy
+ * @update-time: 2022/11/17
+ */
+@Data
+@Entity
+@Table(name = "D_DEPOT_STORE")
+public class Fz35DepotStore implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -5548540780391804729L;
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 20)
+ @PropertyDef(label = "鎵�灞炲簱鍖�")
+ private String deptId;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "鎵�灞炰粨搴�")
+ private String depotId;
+
+ @Column(name = "STORE_TYPE_", length = 6)
+ @PropertyDef(label = "鍌ㄧ伯鏂瑰紡", description = "1:鏁ｈ鍌ㄧ伯 2:鍖呰鍌ㄧ伯 3:鍥村寘鏁ｅ瓨 9:鍏朵粬")
+ private String storeType;
+
+ @Column(name = "FOOD_TYPE_", length = 10)
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodType;
+
+ @Column(name = "FOOD_VARIETY_", length = 10)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevel;
+
+ @Column(name = "FOOD_LOCATION_", length = 50)
+ @PropertyDef(label = "绮浜у湴")
+ private String foodLocation;
+
+ @Column(name = "DEPOT_STATUS_", length = 10)
+ @PropertyDef(label = "浠撳簱鐘舵��")
+ private String depotStatus;
+
+ @Column(name = "FOOD_YEAR_", length = 10)
+ @PropertyDef(label = "鏀惰揣骞村害")
+ private String foodYear;
+
+ @Column(name = "STORE_DATE_")
+ @PropertyDef(label = "鍏ュ簱鏃堕棿", description = "鍏ュ簱鏃堕棿锛岀涓�杞︾伯椋熷叆浠撴椂闂�,鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
+ private Date storeDate;
+
+ @Column(name = "STORAGE_REAL_")
+ @PropertyDef(label = "瀹為檯鍌ㄩ噺", description = "鍗曚綅锛欿G")
+ private Double storageReal;
+
+ @Column(name = "FULL_DATE_")
+ @PropertyDef(label = "灏佷粨鏃ユ湡", description = "褰撹揣浣嶏紙娌圭綈锛夌姸鎬佷负灏佷粨鏃讹紝姝ら」涓哄繀濉」")
+ private Date fullDate;
+
+ @Column(name = "OUT_DATE_")
+ @PropertyDef(label = "鍑轰粨鏃堕棿", description = "鍏ュ簱鏃堕棿锛岀涓�杞︾伯椋熷嚭浠撴椂闂�,鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
+ private Date outDate;
+
+ @Column(name = "GRAIN_HEIGHT_")
+ @PropertyDef(label = "瑁呯伯绾块珮", description = "鍗曚綅锛氱背")
+ private Double grainHeight;
+
+ @Column(name = "GRAIN_VOLUME_")
+ @PropertyDef(label = "瑁呯伯浣撶Н", description = "鍗曚綅锛氱珛鏂圭背")
+ private Double grainVolume;
+
+ @Column(name = "REMARK_", length = 250)
+ @PropertyDef(label = "澶囨敞", description = "澶囨敞淇℃伅")
+ private String remark;
+
+ @Column(name = "UPDATE_USER_", length = 50)
+ @PropertyDef(label = "淇敼浜�")
+ private String updateUser;
+
+ @Column(name = "UPDATE_DATE_")
+ @PropertyDef(label = "淇敼鏃堕棿")
+ private Date updateDate;
+
+ @Column(name = "CREATE_DATE_")
+ @PropertyDef(label = "鍒涘缓鏃堕棿")
+ private Date createDate;
+}
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
index 3ea6123..4df4f97 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
@@ -8,7 +8,7 @@
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1208Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.Fz35Depot;
+import com.fzzy.async.fzzy35.entity.Fz35DepotStore;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1208Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.time.DateUtils;
@@ -46,18 +46,6 @@
*/
public void syncData(String kqdm, String deptId, Date start, Date end) {
-// //淇敼搴撳瓨鏁版嵁涓烘瘡澶�2鐐瑰悓姝ワ紝姣忓ぉ鍙悓姝ヤ竴鏉�
-// Date nowTime = new Date();
-// int hour = ContextUtil.getHourOfDay(nowTime);
-// if (!String.valueOf(hour).equals("2")) {
-// log.info("-------------褰撳墠鏃堕棿涓嶅湪2鐐归挓锛�1208搴撳瓨鎺ュ彛鏁版嵁鎺ュ彛涓嶅悓姝�------------------");
-// return;
-// }
-// int minute = ContextUtil.getMinuteOfHour(nowTime);
-// if (!String.valueOf(minute).equals("00")) {
-// log.info("-------------褰撳墠鏃堕棿涓嶅湪2鐐归挓0鍒嗭紝1208搴撳瓨鎺ュ彛鏁版嵁鎺ュ彛涓嶅悓姝�------------------");
-// return;
-// }
log.info("-------------1208鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
//鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
@@ -69,7 +57,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz35Depot> list = fzzySync1208Rep.listDepot(deptId);
+ List<Fz35DepotStore> list = fzzySync1208Rep.listDepot(deptId, start, end);
if (null == list || list.isEmpty()) {
@@ -83,10 +71,10 @@
Api1208 apiData;
Api1105 api1105;
- for (Fz35Depot fz35Depot : list) {
+ for (Fz35DepotStore fz35DepotStore : list) {
//鑾峰彇璐т綅淇℃伅
- api1105 = commonService.getApi1105Cache(fz35Depot.getId());
+ api1105 = commonService.getApi1105Cache(fz35DepotStore.getDepotId());
if (null == api1105) {
continue;
}
@@ -95,24 +83,24 @@
apiData.setHwdm(api1105.getHwdm());
//绮鍝佺
- String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz35Depot.getFoodVariety());
+ String mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSPZ, fz35DepotStore.getFoodVariety());
apiData.setLspzdm(mappingCode);
//绮鎬ц川
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, fz35Depot.getFoodType());
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSXZ, fz35DepotStore.getFoodType());
apiData.setLsxzdm(mappingCode);
//绮绛夌骇
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, fz35Depot.getFoodLevel());
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_LSDJ, fz35DepotStore.getFoodLevel());
apiData.setLsdjdm(mappingCode);
- apiData.setShnd(fz35Depot.getFoodYear());
+ apiData.setShnd(fz35DepotStore.getFoodYear());
//浜у湴浠ｇ爜
- String cd = commonService.getFoodLocationIdFromCache(fz35Depot.getFoodLocation());
+ String cd = commonService.getFoodLocationIdFromCache(fz35DepotStore.getFoodLocation());
apiData.setCd(cd);
- apiData.setBgy(fz35Depot.getStoreKeeperName());
+ apiData.setBgy(api1105.getBgy());
//绮潈褰掑睘鍗曚綅
apiData.setLqgsdwdm(api1102.getDwdm());
//绮潈琛屾斂鍖哄垝浠ｇ爜
@@ -122,35 +110,35 @@
//鏀跺偍鍦扮偣-榛樿搴撳唴
apiData.setScdd("1");
//鍌ㄧ伯鏂瑰紡
- apiData.setClfs(fz35Depot.getStoreType());
+ apiData.setClfs(fz35DepotStore.getStoreType());
//璐т綅鐘舵��
- mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HWZT, fz35Depot.getDepotStatus());
+ mappingCode = apiTriggerService.getMappingCode(Constant.TRIGGER_P_HWZT, fz35DepotStore.getDepotStatus());
apiData.setHwzt(mappingCode);
- if(null == fz35Depot.getStoreDate()){
- fz35Depot.setStoreDate(new Date());
+ if(null == fz35DepotStore.getStoreDate()){
+ fz35DepotStore.setStoreDate(new Date());
}
//鍏ヤ粨鏃堕棿
- apiData.setRcsj(fz35Depot.getStoreDate());
+ apiData.setRcsj(fz35DepotStore.getStoreDate());
//灏佷粨鏃ユ湡
if("3".equals(apiData.getHwzt())){
- apiData.setFcrq(DateUtils.addDays(fz35Depot.getStoreDate(), 10));
+ apiData.setFcrq(DateUtils.addDays(fz35DepotStore.getStoreDate(), 10));
}
//鍑轰粨瀹屾垚鏃堕棿
if("1".equals(apiData.getHwzt())){
- apiData.setCcwcsj(DateUtils.addDays(fz35Depot.getStoreDate(), 5));
+ apiData.setCcwcsj(DateUtils.addDays(fz35DepotStore.getStoreDate(), 5));
}
//鍥藉埆
apiData.setGb("156");
- apiData.setSjsl(fz35Depot.getStorageReal());
- apiData.setJjsl(fz35Depot.getStorageReal());
+ apiData.setSjsl(fz35DepotStore.getStorageReal());
+ apiData.setJjsl(fz35DepotStore.getStorageReal());
apiData.setSjzlxg(6);
apiData.setLdtj(10000);
apiData.setZhgxsj(new Date());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
- apiData.setBizId(fz35Depot.getId());
+ apiData.setBizId(fz35DepotStore.getId());
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
diff --git a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1208Rep.java b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1208Rep.java
index c2c390e..001532d 100644
--- a/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1208Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy35/repository/Fzzy35Sync1208Rep.java
@@ -1,22 +1,23 @@
package com.fzzy.async.fzzy35.repository;
-import com.fzzy.async.fzzy35.entity.Fz35Depot;
+import com.fzzy.async.fzzy35.entity.Fz35DepotStore;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
+import java.util.Date;
import java.util.List;
/**
* 绮璐攢-绮搴撳瓨
*/
-public interface Fzzy35Sync1208Rep extends JpaRepository<Fz35Depot, String> {
+public interface Fzzy35Sync1208Rep extends JpaRepository<Fz35DepotStore, String> {
/**
* 鏍规嵁淇℃伅鑾峰彇浠撳簱淇℃伅
*
* @return
*/
- @Query("from Fz35Depot where deptId=:deptId order by id ")
- List<Fz35Depot> listDepot(@Param("deptId") String deptId);
+ @Query("from Fz35DepotStore where deptId=:deptId and createDate >=:start and createDate <:end order by createDate ")
+ List<Fz35DepotStore> listDepot(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
}
--
Gitblit v1.9.3