From 6fe4619fd97c6aa90a0bfeffbfa62603691a1ab4 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 29 五月 2025 09:15:03 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 19 +++------
src/main/java/com/zy/nc/mapper/NccJcRyWmsMapper.java | 16 +++++---
src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java | 8 ++++
src/main/java/com/zy/common/model/DetlDto.java | 3 +
src/main/java/com/zy/nc/task/handler/BaseDataHandler.java | 20 ++++++++--
5 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index d007b60..01536e4 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -560,20 +560,15 @@
orderDetl2.setQty(wrkDetl.getAnfme());
orderDetl2.setBatch(wrkDetl.getBatch());
orderDetlService.insert(orderDetl2);
- log.info("鎻掑叆-------------------------{}",orderDetl2.getOrderNo());
+ log.info("鎻掑叆-------------------------{}", orderDetl2.getOrderNo());
} else {
- orderDetl = orderDetlService.selectItem(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), null, orderDetlPakout.getBrand(), orderDetlPakout.getStandby1(), orderDetlPakout.getStandby2(), orderDetlPakout.getStandby3(), orderDetlPakout.getBoxType1(), orderDetlPakout.getBoxType2(), orderDetlPakout.getBoxType3());
- OrderDetl orderDetl2 = new OrderDetl();
- orderDetl2.sync(orderDetl);
- if (orderDetl.getAnfme() <= wrkDetl.getAnfme()) {
- orderDetlService.deleteById(orderDetl.getId());
- } else {
- orderDetl.setAnfme(orderDetl.getAnfme() - wrkDetl.getAnfme());
- orderDetlService.updateById(orderDetl);
+ OrderDetl orderDetl2 = orderDetlService.selectItem(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), null, orderDetlPakout.getBrand(), orderDetlPakout.getStandby1(), orderDetlPakout.getStandby2(), orderDetlPakout.getStandby3(), orderDetlPakout.getBoxType1(), orderDetlPakout.getBoxType2(), orderDetlPakout.getBoxType3());
+ if (orderDetl2.getAnfme() <= wrkDetl.getAnfme()) {
+ orderDetlService.deleteById(orderDetl2.getId());
}
- orderDetl2.setQty(orderDetl.getQty() + wrkDetl.getAnfme());
- orderDetl2.setBatch(wrkDetl.getBatch());
- orderDetlService.updateById(orderDetl2);
+ orderDetl.setQty(orderDetl.getQty() + wrkDetl.getAnfme());
+ orderDetl.setBatch(wrkDetl.getBatch());
+ orderDetlService.updateById(orderDetl);
}
boolean b = orderDetlPakoutService.increaseQtyByOrderNo(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getBrand(), orderDetlPakout.getStandby1(), orderDetlPakout.getStandby2(), orderDetlPakout.getStandby3(), orderDetlPakout.getBoxType1(), orderDetlPakout.getBoxType2(), orderDetlPakout.getBoxType3(), wrkDetl.getAnfme());
if (!b) {
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 97895a5..6cc02fa 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -36,6 +36,9 @@
private Double anfme;
+
+
+
public DetlDto() {
}
diff --git a/src/main/java/com/zy/nc/mapper/NccJcRyWmsMapper.java b/src/main/java/com/zy/nc/mapper/NccJcRyWmsMapper.java
index ca5b0ed..a053b6b 100644
--- a/src/main/java/com/zy/nc/mapper/NccJcRyWmsMapper.java
+++ b/src/main/java/com/zy/nc/mapper/NccJcRyWmsMapper.java
@@ -1,14 +1,18 @@
package com.zy.nc.mapper;
-import com.zy.nc.entity.NccJcRyWms;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.nc.entity.NccJcRyWms;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
/**
-* @author ZY
-* @description 閽堝琛ㄣ�恘cc_jc_ry_wms銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2025-05-13 17:50:58
-* @Entity com.zy.nc.entity.NccJcRyWms
-*/
+ * @author ZY
+ * @description 閽堝琛ㄣ�恘cc_jc_ry_wms銆戠殑鏁版嵁搴撴搷浣淢apper
+ * @createDate 2025-05-13 17:50:58
+ * @Entity com.zy.nc.entity.NccJcRyWms
+ */
+@Mapper
+@Repository
public interface NccJcRyWmsMapper extends BaseMapper<NccJcRyWms> {
diff --git a/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java b/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
index 0499cd0..e4319d6 100644
--- a/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/BaseDataHandler.java
@@ -21,6 +21,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
@@ -83,6 +84,7 @@
/**
* @return
*/
+ @Transactional
public ReturnT<String> start1() {
Page<NccBdCustomerWms> page = new Page<>(1, pageSize);
Page<NccBdCustomerWms> wmsFlag = nccBdCustomerWmsService.selectPage(page, new EntityWrapper<NccBdCustomerWms>().ne("wms_flag", 1));
@@ -96,6 +98,7 @@
/**
* @return
*/
+ @Transactional
public ReturnT<String> start2() {
Page<NccCgCgdhdWms> page = new Page<>(1, pageSize);
Page<NccCgCgdhdWms> wmsFlag = nccCgCgdhdWmsService.selectPage(page, new EntityWrapper<NccCgCgdhdWms>().ne("wms_flag", 1));
@@ -105,6 +108,7 @@
return SUCCESS;
}
+ @Transactional
public ReturnT<String> start3() {
Page<NccCkPddWms> page = new Page<>(1, pageSize);
Page<NccCkPddWms> wmsFlag = nccCkPddWmsService.selectPage(page, new EntityWrapper<NccCkPddWms>().ne("wms_flag", 1));
@@ -114,6 +118,7 @@
return SUCCESS;
}
+ @Transactional
public ReturnT<String> start4() {
Page<NccJcBmWms> page = new Page<>(1, pageSize);
Page<NccJcBmWms> wmsFlag = nccJcBmWmsService.selectPage(page, new EntityWrapper<NccJcBmWms>().ne("wms_flag", 1));
@@ -123,7 +128,7 @@
return SUCCESS;
}
-
+ @Transactional
public ReturnT<String> start5() {
Page<NccJcCkhw> page = new Page<>(1, pageSize);
Page<NccJcCkhw> wmsFlag = nccJcCkhwService.selectPage(page, new EntityWrapper<NccJcCkhw>().ne("wms_flag", 1));
@@ -133,6 +138,7 @@
return SUCCESS;
}
+ @Transactional
public ReturnT<String> start6() {
Page<NccJcCkWms> page = new Page<>(1, pageSize);
Page<NccJcCkWms> wmsFlag = nccJcCkWmsService.selectPage(page, new EntityWrapper<NccJcCkWms>().ne("wms_flag", 1));
@@ -157,6 +163,7 @@
return SUCCESS;
}
+ @Transactional
public ReturnT<String> start7() {
Page<NccJcQilibcBarcodeflowWms> page = new Page<>(1, pageSize);
Page<NccJcQilibcBarcodeflowWms> wmsFlag = nccJcQilibcBarcodeflowWmsService.selectPage(page, new EntityWrapper<NccJcQilibcBarcodeflowWms>().ne("wms_flag", 1));
@@ -166,15 +173,17 @@
return SUCCESS;
}
+ @Transactional
public ReturnT<String> start8() {
Page<NccJcRyWms> page = new Page<>(1, pageSize);
- Page<NccJcRyWms> wmsFlag = nccJcRyWmsService.selectPage(page, new EntityWrapper<NccJcRyWms>().ne("wms_flag", 1).eq("sszzmc", "娴欐睙绂忚幈鏂版潗鏂欒偂浠芥湁闄愬叕鍙哥儫鍙板垎鍏徃"));
+ Page<NccJcRyWms> wmsFlag = nccJcRyWmsService.selectPage(page, new EntityWrapper<NccJcRyWms>().ne("wms_flag", 1).eq("sszzbm", "FYT"));
for (NccJcRyWms nccJcRyWms : wmsFlag.getRecords()) {
User user = userService.selectOne(new EntityWrapper<User>().eq("username", nccJcRyWms.getRybm()));
if (user == null) {
user = new User();
user.setUsername(nccJcRyWms.getRybm());
user.setNickname(nccJcRyWms.getRymc());
+ user.setMobile(nccJcRyWms.getRybm());
user.setRoleId(12L);
user.setStatus(1);
user.setCreateTime(new Date());
@@ -182,18 +191,20 @@
} else {
user.setUsername(nccJcRyWms.getRybm());
user.setNickname(nccJcRyWms.getRymc());
+ user.setMobile(nccJcRyWms.getRybm());
user.setRoleId(12L);
user.setStatus(1);
userService.updateById(user);
}
nccJcRyWms.setWmsFlag(1);
- nccJcRyWmsService.updateById(nccJcRyWms);
+ nccJcRyWmsService.update(nccJcRyWms, new EntityWrapper<NccJcRyWms>().eq("rybm", nccJcRyWms.getRybm()));
log.info("NccJcRyWms鏁版嵁:{}", JSONObject.toJSON(nccJcRyWms));
}
return SUCCESS;
}
+ @Transactional
public ReturnT<String> start9() {
Page<NccJcWlflWms> page = new Page<>(1, pageSize);
Page<NccJcWlflWms> wmsFlag = nccJcWlflWmsService.selectPage(page, new EntityWrapper<NccJcWlflWms>().ne("wms_flag", 1));
@@ -246,6 +257,7 @@
return SUCCESS;
}
+ @Transactional
public ReturnT<String> start10() {
Page<NccOrgCorpWms> page = new Page<>(1, pageSize);
Page<NccOrgCorpWms> wmsFlag = nccOrgCorpWmsService.selectPage(page, new EntityWrapper<NccOrgCorpWms>().ne("wms_flag", 1));
@@ -256,7 +268,7 @@
return SUCCESS;
}
-
+ @Transactional
public ReturnT<String> start13() {
Page<VGetBdMaterial> page = new Page<>(1, pageSize);
Page<VGetBdMaterial> wmsFlag = vGetBdMaterialService.selectPage(page, new EntityWrapper<VGetBdMaterial>().ne("wms_flag", 1));
diff --git a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
index f9e5435..492455b 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -20,6 +20,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.util.ArrayList;
@@ -62,6 +63,7 @@
*
* @return
*/
+ @Transactional
public ReturnT<String> start1(List<NccSaleXsfhmxWms> wmsFlag) {
try {
OpenOrderPakoutParam param = new OpenOrderPakoutParam();
@@ -98,6 +100,7 @@
*
* @return
*/
+ @Transactional
public ReturnT<String> start1In(List<NccSaleXsfhmxWms> wmsFlag) {
try {
OpenOrderPakinParam param = new OpenOrderPakinParam();
@@ -134,6 +137,7 @@
*
* @return
*/
+ @Transactional
public ReturnT<String> start2In(List<NccScZkmxbWms> wmsFlag) {
try {
OpenOrderPakinParam param = new OpenOrderPakinParam();
@@ -171,6 +175,7 @@
*
* @return
*/
+ @Transactional
public ReturnT<String> start2Out(List<NccScZkmxbWms> wmsFlag) {
try {
OpenOrderPakoutParam param = new OpenOrderPakoutParam();
@@ -207,6 +212,7 @@
*
* @return
*/
+ @Transactional
public ReturnT<String> start3(List<NccCgCgdhdWms> wmsFlag) {
try {
OpenOrderPakinParam param = new OpenOrderPakinParam();
@@ -245,6 +251,7 @@
*
* @return
*/
+ @Transactional
public ReturnT<String> start4(List<NccCkPddWms> wmsFlag) {
try {
InventoryCheckOrder param = new InventoryCheckOrder();
@@ -285,6 +292,7 @@
*
* @return
*/
+ @Transactional
public ReturnT<String> start5(List<NccSaleDbddWms> wmsFlag) {
try {
OpenOrderPakoutParam param = new OpenOrderPakoutParam();
--
Gitblit v1.9.1