From 93c0728fc4079af922cdf31ea9883e20e702b97f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 03 一月 2023 17:09:57 +0800
Subject: [PATCH] #中间表对接：订单接收完成
---
src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java | 146 +++++++++++++++++++++++++++++++++++++++++++++---
src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java | 2
src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java | 2
src/main/java/com/zy/ints/entity/ErpDetTb.java | 19 ++++++
src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java | 4
5 files changed, 159 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/ints/entity/ErpDetTb.java b/src/main/java/com/zy/ints/entity/ErpDetTb.java
index c75edc0..5486cfa 100644
--- a/src/main/java/com/zy/ints/entity/ErpDetTb.java
+++ b/src/main/java/com/zy/ints/entity/ErpDetTb.java
@@ -146,5 +146,24 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.billdate);
}
+ public String getIokindid$(){
+ if (null == this.iokindid){ return null; }
+ switch (this.iokindid){
+ case "TF_PSS":
+ return "閲囪喘閿�鍞�";
+ case "TF_IC":
+ return "搴撳瓨璋冩嫧";
+ case "TF_IJ":
+ return "搴撳瓨璋冩暣";
+ case "TF_ML":
+ return "鐢熶骇棰嗘枡";
+ case "TF_MM0":
+ return "鐢熶骇缂村簱";
+ case "TF_TC":
+ return "鎵樺伐閫�鍥�";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
}
diff --git a/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java b/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
index 9c6d033..168e85b 100644
--- a/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
@@ -1,7 +1,22 @@
package com.zy.ints.task.scheduler;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.SnowflakeIdWorker;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.DocType;
+import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.MatService;
+import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.OrderService;
+import com.zy.common.model.DetlDto;
import com.zy.ints.entity.ErpDetTb;
+import com.zy.ints.entity.ErpDetTbBak;
+import com.zy.ints.entity.Prdt;
+import com.zy.ints.entity.PrdtBak;
import com.zy.ints.erp.ErpSqlServer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +24,9 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
import java.util.List;
/**
@@ -27,6 +45,15 @@
private ErpSqlServer erpSqlServer;
@Autowired
private MatService matService;
+ @Autowired
+ private OrderService orderService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private DocTypeService docTypeService;
+
/**
* 鑾峰彇鍏ュ嚭搴撹鍗曚俊鎭�
*/
@@ -34,27 +61,126 @@
public void InOrOutOrder() {
if (!erpEnabled) return;
String sqlSelectErpDetTb = "select bill_no as billNo,prd_no as prdNo,iokindid,add_id as addId,qty,prd_mark as prdMark,wh,billdate,status,temp1,temp2,temp3 from erp_det_tb where 1=1";
- String sqlUpDateErpDetTbOne = "update erp_det_tb set status=1 where prd_no=";
- String sqlUpDateErpDetTbTwo = "update erp_det_tb set status=2 where prd_no=";
+ String sqlUpDateErpDetTbOne = "update erp_det_tb set status=1 where 1=1 and prd_no=";
+ String sqlUpDateErpDetTbTwo = "update erp_det_tb set status=2 ";
try {
List<ErpDetTb> erpDetTbs = erpSqlServer.select(sqlSelectErpDetTb, ErpDetTb.class);
- if (erpDetTbs.size() > 0){
- for (ErpDetTb erpDetTb:erpDetTbs){
+ if (erpDetTbs.size() > 0) {
+ for (ErpDetTb erpDetTb : erpDetTbs) {
+ Date now = new Date();
Integer status = erpDetTb.getStatus();
- if (status == 0){
+ if (status == 0) {
+ Mat mat = matService.selectByMatnr(erpDetTb.getPrdNo());
+ if (Cools.isEmpty(mat)) {
+ erpSqlServer.update(sqlUpDateErpDetTbTwo + ",temp1='鍝佸彿淇℃伅鍦ㄧ珛搴撲笉瀛樺湪锛岃鍏堟坊鍔犲晢鍝侊紒锛侊紒'" + "where 1=1 and prd_no=" + "'" + erpDetTb.getPrdNo() + "'");
+ } else {
+ Order order = orderService.selectByNo(erpDetTb.getBillNo());
+ if (Cools.isEmpty(order)) {
+ order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ erpDetTb.getBillNo(), // 璁㈠崟缂栧彿
+ DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
+ null, // 鍗曟嵁绫诲瀷
+ null, // 椤圭洰缂栧彿
+ null, //
+ null, // 璋冩嫧椤圭洰缂栧彿
+ null, // 鍒濆绁ㄦ嵁鍙�
+ null, // 绁ㄦ嵁鍙�
+ null, // 瀹㈡埛缂栧彿
+ null, // 瀹㈡埛
+ null, // 鑱旂郴鏂瑰紡
+ null, // 鎿嶄綔浜哄憳
+ null, // 鍚堣閲戦
+ null, // 浼樻儬鐜�
+ null, // 浼樻儬閲戦
+ null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, // 瀹炰粯閲戦
+ null, // 浠樻绫诲瀷
+ null, // 涓氬姟鍛�
+ null, // 缁撶畻澶╂暟
+ null, // 閭垂鏀粯绫诲瀷
+ null, // 閭垂
+ null, // 浠樻鏃堕棿
+ null, // 鍙戣揣鏃堕棿
+ null, // 鐗╂祦鍚嶇О
+ null, // 鐗╂祦鍗曞彿
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ 9999L, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ 9999L, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ String InAndOut = erpDetTb.getAddId().equals("2") ? "锛堝嚭搴擄級" : "锛堝叆搴擄級";
+ DocType docType = docTypeService.selectOrAdd(erpDetTb.getIokindid$() + InAndOut, erpDetTb.getAddId().equals("1"));
+ if (!Cools.isEmpty(docType)) {
+ order.setDocType(docType.getDocId());
+ if (!orderService.insert(order)) {
+ throw new CoolException("娣诲姞璁㈠崟涓绘。淇℃伅澶辫触锛侊紒锛�");
+ }
+ }
+ }
+ Order order1 = orderService.selectByNo(erpDetTb.getBillNo());
+ if (!Cools.isEmpty(order1)) {
+ OrderDetl orderDetl = orderDetlService.selectItem(order1.getId(), erpDetTb.getBillNo(), erpDetTb.getPrdMark());
+ if (Cools.isEmpty(orderDetl)) {
+ orderDetl = new OrderDetl();
+ orderDetl.setOrderId(order1.getId());
+ orderDetl.setOrderNo(erpDetTb.getBillNo());
+ orderDetl.setAnfme(erpDetTb.getQty());
+ orderDetl.setQty(0.0D);
+ orderDetl.setMatnr(erpDetTb.getPrdNo());
+ orderDetl.setMaktx(mat.getMaktx());
+ orderDetl.setBatch(erpDetTb.getPrdMark());
+ orderDetl.setSpecs(mat.getSpecs());
+ orderDetl.setUnit(mat.getUnit());
- }else if (status == 1){
+ orderDetl.setStatus(1);
+ orderDetl.setCreateBy(9999L);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(9999L);
+ orderDetl.setUpdateTime(now);
+ if (orderDetlService.insert(orderDetl)){
+ erpSqlServer.update(sqlUpDateErpDetTbOne + "'" + erpDetTb.getPrdNo() + "'");
+ }else {
+ erpSqlServer.update(sqlUpDateErpDetTbTwo + ",temp1='娣诲姞璁㈠崟鏄庣粏妗ｅけ璐ワ紒锛侊紒'" + "where 1=1 and prd_no=" + "'" + erpDetTb.getPrdNo() + "'");
+ }
+ }
+ }
+ }
+ } else if (status == 1) {
+ HashMap<String, Object> condition = new HashMap<>();
+ condition.put("bill_no", "'" + erpDetTb.getBillNo() + "'");
+ condition.put("prd_no", "'" + erpDetTb.getPrdNo() + "'");
+ condition.put("iokindid", "'" + erpDetTb.getIokindid() + "'");
+ condition.put("add_id", "'" + erpDetTb.getAddId() + "'");
+ condition.put("qty", "'" + erpDetTb.getQty() + "'");
+ condition.put("prd_mark", "'" + erpDetTb.getPrdMark() + "'");
+ condition.put("wh", "'" + erpDetTb.getWh() + "'");
+ condition.put("billdate", "'" + erpDetTb.getBilldate() + "'");
+ condition.put("status", "'" + erpDetTb.getStatus() + "'");
+ condition.put("temp1", "'" + erpDetTb.getTemp1() + "'");
+ condition.put("temp2", "'" + erpDetTb.getTemp2() + "'");
+ condition.put("temp3", "'" + erpDetTb.getTemp3() + "'");
+ erpSqlServer.insert(ErpDetTbBak.class, condition);
- }else if (status == 2){
+ HashMap<String, String> condition2 = new HashMap<>();
+ condition.put("bill_no", "'" + erpDetTb.getBillNo() + "'");
+ condition2.put("prd_no", "'" + erpDetTb.getPrdNo() + "'");
+ condition.put("prd_mark", "'" + erpDetTb.getPrdMark() + "'");
+ erpSqlServer.delete(ErpDetTb.class, condition2);
+ } else if (status == 2) {
- }else {
+ } else {
}
}
}
- }catch (Exception e){
-
+ } catch (Exception e) {
+ Date date = new Date();
+ log.error(date + ": 琛ㄥ悕锛歟rp_det_tb :" + e);
}
}
}
diff --git a/src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java b/src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java
index bb94110..2f53d22 100644
--- a/src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java
@@ -25,7 +25,7 @@
@Autowired
private ErpSqlServer erpSqlServer;
/**
- * 鑾峰彇鍏ュ嚭搴撹鍗曚俊鎭�
+ * ERP涓巐k搴撳瓨鏁版嵁姣斿
*/
@Scheduled(cron = "${erp.refreshtime}")
public void InOrOutOrder() {
diff --git a/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java b/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java
index 5fe2939..3f3b7d3 100644
--- a/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java
@@ -65,9 +65,9 @@
matNew.setMaktx(prdt.getName());
matNew.setUnit(prdt.getUt());
matNew.setSpecs(prdt.getSpc());
- matNew.setCreateBy(9999L);
+ matNew.setCreateBy(9999L);//9999琛ㄧずerp涓嬪彂
matNew.setCreateTime(date);
- matNew.setUpdateBy(9999L);
+ matNew.setUpdateBy(9999L);//9999琛ㄧずerp涓嬪彂
matNew.setUpdateTime(date);
if (matService.insert(matNew)) {
erpSqlServer.update(sqlUpDatePrdtOne + "'" + prdt.getPrdNo() + "'");
diff --git a/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java b/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java
index db3a673..c2bd126 100644
--- a/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java
@@ -25,7 +25,7 @@
@Autowired
private ErpSqlServer erpSqlServer;
/**
- * 鑾峰彇鍏ュ嚭搴撹鍗曚俊鎭�
+ * 涓婃姤鍏ュ嚭搴撳畬缁撹鍗曚俊鎭�
*/
@Scheduled(cron = "${erp.refreshtime}")
public void InOrOutOrder() {
--
Gitblit v1.9.1