From fc24c266d88751bc431b5d61c05c0c388d9f0350 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 01 六月 2023 16:14:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java | 137 ++++++++++++++++++++++++++++++++-------------
1 files changed, 98 insertions(+), 39 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 66605c0..8911123 100644
--- a/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
@@ -1,17 +1,11 @@
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.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.asrs.entity.*;
+import com.zy.asrs.service.*;
import com.zy.ints.entity.ErpDetTb;
import com.zy.ints.entity.ErpDetTbBak;
import com.zy.ints.erp.ErpSqlServer;
@@ -38,6 +32,10 @@
*/
@Value("${erp.enabled}")
private Boolean erpEnabled;
+ @Value("${erp.enabledErpDetTb}")
+ private Boolean erpEnabledErpDetTb;
+ @Value("${erp.useName.ip}")
+ private String ip;
@Autowired
private ErpSqlServer erpSqlServer;
@Autowired
@@ -50,16 +48,18 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private DocTypeService docTypeService;
+ @Autowired
+ private ApiLogService apiLogService;
/**
* 鑾峰彇鍏ュ嚭搴撹鍗曚俊鎭�
*/
@Scheduled(cron = "${erp.refreshtime}")
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 1=1 and prd_no=";
- String sqlUpDateErpDetTbTwo = "update erp_det_tb set status=2 ";
+ 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,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 ";
try {
List<ErpDetTb> erpDetTbs = erpSqlServer.select(sqlSelectErpDetTb, ErpDetTb.class);
@@ -70,7 +70,13 @@
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() + "'");
+ 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());
if (Cools.isEmpty(order)) {
@@ -110,18 +116,22 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
- String InAndOut = erpDetTb.getAddId().equals("2") ? "锛堝嚭搴擄級" : "锛堝叆搴擄級";
- DocType docType = docTypeService.selectOrAdd(erpDetTb.getIokindid$() + 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)) {
- throw new CoolException("娣诲姞璁㈠崟涓绘。淇℃伅澶辫触锛侊紒锛�");
+ callApiLogSave(erpDetTb, "ERP_DETTB", "璁㈠崟涓绘。娣诲姞澶辫触锛侊紒", false);
+ continue;
+ } else {
+ callApiLogSave(erpDetTb, "ERP_DETTB", "璁㈠崟涓绘。娣诲姞鎴愬姛锛侊紒", true);
}
}
}
Order order1 = orderService.selectByNo(erpDetTb.getBillNo());
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()).eq("matnr",erpDetTb.getPrdNo()));
if (Cools.isEmpty(orderDetl)) {
orderDetl = new OrderDetl();
orderDetl.setOrderId(order1.getId());
@@ -133,16 +143,49 @@
orderDetl.setBatch(erpDetTb.getPrdMark());
orderDetl.setSpecs(mat.getSpecs());
orderDetl.setUnit(mat.getUnit());
+ orderDetl.setOrigin(erpDetTb.getItm().toString());
orderDetl.setStatus(1);
orderDetl.setCreateBy(9999L);
orderDetl.setCreateTime(now);
orderDetl.setUpdateBy(9999L);
orderDetl.setUpdateTime(now);
- if (orderDetlService.insert(orderDetl)){
+ orderDetl.setMemo(erpDetTb.getWh());
+ if (orderDetlService.insert(orderDetl)) {
erpSqlServer.update(sqlUpDateErpDetTbOne + "'" + erpDetTb.getPrdNo() + "'");
- }else {
- erpSqlServer.update(sqlUpDateErpDetTbTwo + ",temp1='娣诲姞璁㈠崟鏄庣粏妗ｅけ璐ワ紒锛侊紒'" + "where 1=1 and prd_no=" + "'" + 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 (!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);
}
}
}
@@ -150,35 +193,51 @@
} else if (status == 1) {
String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(now);
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", "'" + format + "'");
- condition.put("status", "'" + erpDetTb.getStatus() + "'");
- condition.put("temp1", "'" + erpDetTb.getTemp1() + "'");
- condition.put("temp2", "'" + erpDetTb.getTemp2() + "'");
- condition.put("temp3", "'" + erpDetTb.getTemp3() + "'");
+ condition.put("BIL_NO", "'" + erpDetTb.getBillNo() + "'");
+ condition.put("PRD_NO", "'" + erpDetTb.getPrdNo() + "'");
+ condition.put("ITM", "'" + erpDetTb.getItm() + "'");
+ condition.put("ADD_ID", "'" + erpDetTb.getAddId2() + "'");
+ condition.put("QTY", "'" + erpDetTb.getQty() + "'");
+ condition.put("PRD_MARK", "'" + erpDetTb.getPrdMark() + "'");
+ condition.put("WH", "'" + erpDetTb.getWh() + "'");
+ condition.put("BIL_DATE", "'" + format + "'");
+ 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);
+// callApiLogSave(erpDetTb, "ERP_DETTB_BAK", "ERP涓嬪彂璁㈠崟澶囦唤鎴愬姛锛侊紒", true);
+
HashMap<String, String> condition2 = new HashMap<>();
- condition2.put("bill_no", "'" + erpDetTb.getBillNo() + "'");
- condition2.put("prd_no", "'" + erpDetTb.getPrdNo() + "'");
- condition2.put("prd_mark", "'" + erpDetTb.getPrdMark() + "'");
+ condition2.put("BIL_NO", "'" + erpDetTb.getBillNo() + "'");
+ condition2.put("PRD_NO", "'" + erpDetTb.getPrdNo() + "'");
+ condition2.put("ITM", "'" + erpDetTb.getItm() + "'");
+// condition2.put("PRD_MARK", "'" + erpDetTb.getPrdMark() + "'");
erpSqlServer.delete(ErpDetTb.class, condition2);
- } else if (status == 2) {
+
+// callApiLogSave(erpDetTb, "ERP_DETTB", "ERP涓嬪彂璁㈠崟澶囦唤鍚庡垹闄ゆ垚鍔燂紒锛�", true);
} else {
-
+ 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);
+ }
}
}
}
} catch (Exception e) {
Date date = new Date();
- log.error(date + ": 琛ㄥ悕锛歟rp_det_tb :" + e);
+ log.error(date + ": 琛ㄥ悕锛欵RP_DETTB :" + e);
}
}
+
+ public void callApiLogSave(ErpDetTb erpDetTb, String tableName, String response, Boolean bool) {
+ apiLogService.save("ERP涓嬪彂璁㈠崟淇℃伅", tableName, "null", ip,
+ "璁㈠崟鍙凤細" + erpDetTb.getBillNo() + "銆佸搧鍙凤細" + erpDetTb.getPrdNo() + "銆佽揣鍝佺壒寰侊細" + erpDetTb.getPrdMark() + "銆佺姸鎬侊細" + erpDetTb.getStatus$(),
+ response, bool);
+ }
}
--
Gitblit v1.9.1