From d3234825d804a6a205dba1c6092acc8e29981b81 Mon Sep 17 00:00:00 2001
From: lfd <1>
Date: 星期四, 06 三月 2025 10:11:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java | 74 ++++++++++++++++++++++++++++--------
1 files changed, 57 insertions(+), 17 deletions(-)
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 0b0c5f8..0e41258 100644
--- a/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
@@ -1,12 +1,10 @@
package com.zy.ints.task.scheduler;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SnowflakeIdWorker;
-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.entity.*;
import com.zy.asrs.service.*;
import com.zy.ints.entity.ErpDetTb;
import com.zy.ints.entity.ErpDetTbBak;
@@ -59,7 +57,7 @@
@Scheduled(cron = "${erp.refreshtime}")
public void InOrOutOrder() {
if (!erpEnabledErpDetTb) return;
- String sqlSelectErpDetTb = "select BIL_NO as billNo,prd_no as prdNo,ITM as itm,ADD_ID as addId2,QTY as qty,PRD_MARK as prdMark,WH as wh,BIL_DATE as billdate,STATUS as status,Temp1 as temp1,Temp2 as temp2,Temp3 as temp3 from ERP_DETTB where 1=1";
+ String sqlSelectErpDetTb = "select BIL_NO as billNo,prd_no as prdNo,ITM as itm,ADD_ID as addId2,QTY as qty,PRD_MARK as prdMark,WH as wh,STATUS as status,Temp1 as temp1,Temp2 as temp2,Temp3 as temp3 from ERP_DETTB where 1=1";
String sqlUpDateErpDetTbOne = "update ERP_DETTB set STATUS=1 where 1=1 and PRD_NO=";
String sqlUpDateErpDetTbTwo = "update ERP_DETTB set STATUS=2 ";
@@ -72,14 +70,19 @@
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() + "'");
- callApiLogSave(erpDetTb, "ERP_DETTB", "鍝佸彿淇℃伅鍦ㄧ珛搴撲笉瀛樺湪锛岃鍏堟坊鍔犲晢鍝侊紒锛侊紒", false);
+ if(Cools.isEmpty(erpDetTb.getTemp1())){
+ erpSqlServer.update(sqlUpDateErpDetTbTwo + ",Temp1='鍝佸彿淇℃伅鍦ㄧ珛搴撲笉瀛樺湪锛岃鍏堟坊鍔犲晢鍝侊紒锛侊紒'" + "where 1=1 "
+ +" and PRD_NO=" + "'" + erpDetTb.getPrdNo() + "'"
+ +" and ITM=" + "'" + erpDetTb.getItm() + "'"
+ +" and BIL_NO=" + "'" + erpDetTb.getBillNo() + "'");
+ callApiLogSave(erpDetTb, "ERP_DETTB", "鍝佸彿淇℃伅鍦ㄧ珛搴撲笉瀛樺湪锛岃鍏堟坊鍔犲晢鍝侊紒锛侊紒", false);
+ }
} else {
- Order order = orderService.selectByNo(erpDetTb.getBillNo());
+ Order order = orderService.selectByNo(erpDetTb.getBillNo()+"---"+erpDetTb.getItm());
if (Cools.isEmpty(order)) {
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
- erpDetTb.getBillNo(), // 璁㈠崟缂栧彿
+ erpDetTb.getBillNo()+"---"+erpDetTb.getItm(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
null, // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
@@ -113,8 +116,8 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
- String InAndOut = erpDetTb.getAddId2()==2 ? "锛堝嚭搴擄級" : "锛堝叆搴擄級";
- DocType docType = docTypeService.selectOrAdd("ERP璁㈠崟"+InAndOut, erpDetTb.getAddId().equals("1"));
+ String InAndOut = erpDetTb.getAddId2().equals(2) ? "锛堝嚭搴擄級" : "锛堝叆搴擄級";
+ DocType docType = docTypeService.selectOrAdd("ERP璁㈠崟"+InAndOut, erpDetTb.getAddId2().equals(1));
if (!Cools.isEmpty(docType)) {
order.setDocType(docType.getDocId());
if (!orderService.insert(order)) {
@@ -125,13 +128,14 @@
}
}
}
- Order order1 = orderService.selectByNo(erpDetTb.getBillNo());
+ Order order1 = orderService.selectByNo(erpDetTb.getBillNo()+"---"+erpDetTb.getItm());
if (!Cools.isEmpty(order1)) {
- OrderDetl orderDetl = orderDetlService.selectItem(order1.getId(), erpDetTb.getBillNo(), erpDetTb.getPrdMark());
+// OrderDetl orderDetl = orderDetlService.selectItem(order1.getId(), erpDetTb.getBillNo(), erpDetTb.getPrdMark());
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no",erpDetTb.getBillNo()+"---"+erpDetTb.getItm()).eq("matnr",erpDetTb.getPrdNo()));
if (Cools.isEmpty(orderDetl)) {
orderDetl = new OrderDetl();
orderDetl.setOrderId(order1.getId());
- orderDetl.setOrderNo(erpDetTb.getBillNo());
+ orderDetl.setOrderNo(erpDetTb.getBillNo()+"---"+erpDetTb.getItm());
orderDetl.setAnfme(erpDetTb.getQty());
orderDetl.setQty(0.0D);
orderDetl.setMatnr(erpDetTb.getPrdNo());
@@ -139,6 +143,7 @@
orderDetl.setBatch(erpDetTb.getPrdMark());
orderDetl.setSpecs(mat.getSpecs());
orderDetl.setUnit(mat.getUnit());
+ orderDetl.setOrigin(erpDetTb.getItm().toString());
orderDetl.setStatus(1);
orderDetl.setCreateBy(9999L);
@@ -150,7 +155,36 @@
erpSqlServer.update(sqlUpDateErpDetTbOne + "'" + erpDetTb.getPrdNo() + "'");
callApiLogSave(erpDetTb, "ERP_DETTB", "鎺ユ敹ERP涓嬪彂璁㈠崟鎺ユ敹鎴愬姛锛侊紒", true);
} else {
- erpSqlServer.update(sqlUpDateErpDetTbTwo + ",temp1='娣诲姞璁㈠崟鏄庣粏妗ｅけ璐ワ紒锛侊紒'" + "where 1=1 and PRD_NO=" + "'" + erpDetTb.getPrdNo() + "'");
+ if (Cools.isEmpty(erpDetTb.getTemp2())){
+ erpSqlServer.update(sqlUpDateErpDetTbTwo + ",temp2='娣诲姞璁㈠崟鏄庣粏妗ｅけ璐ワ紒锛侊紒'" + "where 1=1 "
+ +" and PRD_NO=" + "'" + erpDetTb.getPrdNo() + "'"
+ +" and ITM=" + "'" + erpDetTb.getItm() + "'"
+ +" and BIL_NO=" + "'" + erpDetTb.getBillNo() + "'");
+ callApiLogSave(erpDetTb, "ERP_DETTB", "ERP涓嬪彂璁㈠崟鎺ユ敹澶辫触锛侊紒", false);
+ }
+ }
+ }else if (!erpDetTb.getItm().toString().equals(orderDetl.getOrigin())){
+ orderDetl.setAnfme(orderDetl.getAnfme()+erpDetTb.getQty());
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ wrapper.eq("id", orderDetl.getId());
+ if (orderDetlService.update(orderDetl,wrapper)) {
+ erpSqlServer.update(sqlUpDateErpDetTbOne + "'" + erpDetTb.getPrdNo() + "'");
+ callApiLogSave(erpDetTb, "ERP_DETTB", "鎺ユ敹ERP涓嬪彂璁㈠崟鎺ユ敹鎴愬姛锛侊紒", true);
+ } else {
+ if (Cools.isEmpty(erpDetTb.getTemp2())){
+ erpSqlServer.update(sqlUpDateErpDetTbTwo + ",temp2='鏇存柊璁㈠崟鏄庣粏妗ｅけ璐ワ紒锛侊紒'" + "where 1=1 "
+ +" and PRD_NO=" + "'" + erpDetTb.getPrdNo() + "'"
+ +" and ITM=" + "'" + erpDetTb.getItm() + "'"
+ +" and BIL_NO=" + "'" + erpDetTb.getBillNo() + "'");
+ callApiLogSave(erpDetTb, "ERP_DETTB", "ERP涓嬪彂璁㈠崟鎺ユ敹澶辫触锛侊紒", false);
+ }
+ }
+ }else {
+ if (Cools.isEmpty(erpDetTb.getTemp3())){
+ erpSqlServer.update(sqlUpDateErpDetTbTwo + ",temp3='鏇存柊璁㈠崟鏄庣粏妗ｅけ璐ワ紒锛侊紒璁㈠崟鏄庣粏宸插瓨鍦紒锛�'" + "where 1=1 "
+ +" and PRD_NO=" + "'" + erpDetTb.getPrdNo() + "'"
+ +" and ITM=" + "'" + erpDetTb.getItm() + "'"
+ +" and BIL_NO=" + "'" + erpDetTb.getBillNo() + "'");
callApiLogSave(erpDetTb, "ERP_DETTB", "ERP涓嬪彂璁㈠崟鎺ユ敹澶辫触锛侊紒", false);
}
}
@@ -179,13 +213,19 @@
condition2.put("BIL_NO", "'" + erpDetTb.getBillNo() + "'");
condition2.put("PRD_NO", "'" + erpDetTb.getPrdNo() + "'");
condition2.put("ITM", "'" + erpDetTb.getItm() + "'");
- condition2.put("PRD_MARK", "'" + erpDetTb.getPrdMark() + "'");
+// condition2.put("PRD_MARK", "'" + erpDetTb.getPrdMark() + "'");
erpSqlServer.delete(ErpDetTb.class, condition2);
// callApiLogSave(erpDetTb, "ERP_DETTB", "ERP涓嬪彂璁㈠崟澶囦唤鍚庡垹闄ゆ垚鍔燂紒锛�", true);
} else {
- callApiLogSave(erpDetTb, "ERP_DETTB", "鎺ユ敹ERP涓嬪彂璁㈠崟澶辫触锛侊紒锛佺姸鎬佸紓甯革紒锛侊紒", false);
+ if (Cools.isEmpty(erpDetTb.getTemp1()) && Cools.isEmpty(erpDetTb.getTemp2()) && Cools.isEmpty(erpDetTb.getTemp3())){
+ erpSqlServer.update(sqlUpDateErpDetTbTwo + ",Temp1='鎺ユ敹ERP涓嬪彂璁㈠崟澶辫触锛侊紒锛佺姸鎬佸紓甯革紒锛侊紒璇稥RP銆佺珛搴撳弻鏂瑰崗鍔╄В鍐炽��'" + "where 1=1 "
+ +" and PRD_NO=" + "'" + erpDetTb.getPrdNo() + "'"
+ +" and ITM=" + "'" + erpDetTb.getItm() + "'"
+ +" and BIL_NO=" + "'" + erpDetTb.getBillNo() + "'");
+ callApiLogSave(erpDetTb, "ERP_DETTB", "鎺ユ敹ERP涓嬪彂璁㈠崟澶辫触锛侊紒锛佺姸鎬佸紓甯革紒锛侊紒", false);
+ }
}
}
}
--
Gitblit v1.9.1