From b4227b5145943e067351a2a59ca34826b41d6fb7 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 15 四月 2025 09:46:30 +0800
Subject: [PATCH] 界面翻译为俄语
---
src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 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 735cad3..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;
@@ -80,11 +78,11 @@
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, // 椤圭洰缂栧彿
@@ -130,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());
@@ -144,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);
@@ -163,6 +163,30 @@
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);
+ }
}
}
}
--
Gitblit v1.9.1