From 3ada2dff1bd55dd22d9c10e054db13b1fd2ed2e3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 08 十二月 2022 14:18:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/erp/task/ErpScheduler.java | 42 ++++++++++++++++++++-
src/main/java/com/zy/common/service/erp/entity/Goods.java | 14 ++----
src/main/java/com/zy/common/service/erp/entity/VoucherDetail.java | 2 -
src/main/java/com/zy/common/service/erp/entity/Voucher.java | 4 -
4 files changed, 46 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/common/service/erp/entity/Goods.java b/src/main/java/com/zy/common/service/erp/entity/Goods.java
index 1ef5f97..916de5d 100644
--- a/src/main/java/com/zy/common/service/erp/entity/Goods.java
+++ b/src/main/java/com/zy/common/service/erp/entity/Goods.java
@@ -16,9 +16,9 @@
private Integer NumOfBobbins;
- private Double NWT;
+ private Double NWT; // 鍑�閲�
- private Double GWT;
+ private Double GWT; // 姣涢噸
private String ProdDate;
@@ -36,14 +36,10 @@
private String PACKING_DATE;
- private String State;
-
- private String LastVoucherID;
-
- private String PreVoucherID;
-
private String LastUpdatedDate;
- private Integer IsGetData;
+ private Integer State;
+
+ private String location;
}
diff --git a/src/main/java/com/zy/common/service/erp/entity/Voucher.java b/src/main/java/com/zy/common/service/erp/entity/Voucher.java
index 44cfdc5..79ee0bb 100644
--- a/src/main/java/com/zy/common/service/erp/entity/Voucher.java
+++ b/src/main/java/com/zy/common/service/erp/entity/Voucher.java
@@ -26,8 +26,6 @@
private Integer TotalCount;
- private String State;
-
private String AccDate;
private String VBELN;
@@ -42,6 +40,6 @@
private String LastUpdatedDate;
- private Integer IsGetData;
+ private Integer State;
}
diff --git a/src/main/java/com/zy/common/service/erp/entity/VoucherDetail.java b/src/main/java/com/zy/common/service/erp/entity/VoucherDetail.java
index 2b44df4..ff4be0d 100644
--- a/src/main/java/com/zy/common/service/erp/entity/VoucherDetail.java
+++ b/src/main/java/com/zy/common/service/erp/entity/VoucherDetail.java
@@ -16,6 +16,4 @@
private String LastUpdatedDate;
- private Integer IsGetData;
-
}
diff --git a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
index 2ce259c..d60e592 100644
--- a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
+++ b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
@@ -1,12 +1,23 @@
package com.zy.common.service.erp.task;
+import com.alibaba.fastjson.JSON;
+import com.core.common.Cools;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.Tag;
+import com.zy.asrs.service.MatService;
+import com.zy.asrs.service.TagService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.common.service.erp.ErpService;
+import com.zy.common.service.erp.entity.Goods;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
/**
* erp浠诲姟鎺у埗鍣�
@@ -18,10 +29,37 @@
@Autowired
private ErpService erpService;
+ @Autowired
+ private TagService tagService;
+ @Autowired
+ private MatService matService;
- @Scheduled(cron = "0/30 * * * * ? ")
+ @Scheduled(cron = "0/5 * * * * ? ")
@Synchronized
- public void syncMat() {
+ @Transactional
+ public synchronized void syncMat() {
+ Tag top = tagService.getTop();
+ List<Goods> goods = erpService.selectGoods(1);
+ if (!Cools.isEmpty(goods)) {
+ for (Goods good : goods) {
+ Mat mat = matService.selectByMatnr(good.getBarCode());
+ if (mat == null) {
+ mat = new Mat();
+ mat.setTagId(top.getId());
+ mat.setMatnr(good.getBarCode());
+ mat.setMaktx(good.getMaterialNO());
+ mat.setSpecs(good.getProdSpec());
+ mat.setModel(good.getBatch());
+ mat.setWeight(good.getNWT());
+ mat.setUnits(good.getNumOfBobbins()==null?null:good.getNumOfBobbins().doubleValue());
+ mat.setManuDate(good.getProdDate());
+
+ if (!matService.insert(mat)) {
+ throw new CoolException(JSON.toJSONString(good) + "鍟嗗搧鍚屾澶辫触");
+ }
+ }
+ }
+ }
}
}
--
Gitblit v1.9.1