From ac4341ea6b66ae02427d39d35f41d42d78b2eb2e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 二月 2025 10:08:32 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WorkController.java | 80 ++++++++++------------------------------
1 files changed, 20 insertions(+), 60 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WorkController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WorkController.java
index cf6b603..63a6520 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WorkController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WorkController.java
@@ -5,12 +5,13 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
-import com.zy.asrs.wms.asrs.entity.Loc;
-import com.zy.asrs.wms.asrs.entity.LocDetl;
-import com.zy.asrs.wms.asrs.entity.LocDetlField;
-import com.zy.asrs.wms.asrs.entity.MatField;
+import com.zy.asrs.wms.asrs.entity.*;
+import com.zy.asrs.wms.asrs.entity.enums.LocStsType;
+import com.zy.asrs.wms.asrs.entity.enums.OrderSettleType;
+import com.zy.asrs.wms.asrs.entity.enums.TaskStsType;
import com.zy.asrs.wms.asrs.entity.param.GeneratePakInParam;
import com.zy.asrs.wms.asrs.entity.param.LocAdjustParam;
+import com.zy.asrs.wms.asrs.entity.param.LocTransferParam;
import com.zy.asrs.wms.asrs.service.*;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.system.controller.BaseController;
@@ -57,65 +58,24 @@
@PostMapping("/loc/adjust")
@Transactional
public R locAdjust(@RequestBody LocAdjustParam param) {
- if (param == null) {
- return R.error("鍙傛暟涓嶈兘涓虹┖");
+ try {
+ workService.locAdjust(param);
+ return R.ok();
+ } catch (Exception e) {
+ return R.error(e.getMessage());
}
+ }
- if (Cools.isEmpty(param.getLocNo())) {
- return R.error("搴撲綅鍙蜂笉鑳戒负绌�");
+ @OperationLog("搴撳瓨绉昏浆")
+ @PostMapping("/loc/transfer")
+ @Transactional
+ public R locTransfer(@RequestBody LocTransferParam param) {
+ try {
+ workService.locTransfer(param);
+ return R.ok();
+ } catch (Exception e) {
+ return R.error(e.getMessage());
}
-
- if (param.getDetls() == null) {
- return R.error("搴撳瓨鏄庣粏涓嶈兘涓虹┖");
- }
-
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, param.getLocNo()));
- if (loc == null) {
- return R.error("搴撲綅涓嶅瓨鍦�");
- }
-
- //鍒犻櫎婧愬簱瀛�
- locDetlService.removeLocDetl(loc.getId());
-
- List<MatField> matFields = matFieldService.list(new LambdaQueryWrapper<MatField>().eq(MatField::getUnique, 1));
- for (Map<String, Object> map : param.getDetls()) {
- LocDetl locDetl = JSON.parseObject(JSON.toJSONString(map), LocDetl.class);
- HashMap<String, Object> uniqueFields = new HashMap<>();
- for (Map.Entry<String, Object> entry : map.entrySet()) {
- for (MatField field : matFields) {
- if (entry.getKey().equals(field.getName())) {
- uniqueFields.put(entry.getKey(), entry.getValue());
- }
- }
- }
- locDetl.setAnfme(Double.parseDouble(map.get("qty").toString()));
- locDetl.syncFieldMap(uniqueFields);
-
- if (locDetl.getAnfme() <= 0D) {
- throw new CoolException("鏁伴噺涓嶈兘灏忎簬0");
- }
-
- locDetl.setId(null);
- locDetl.setLocId(loc.getId());
- locDetl.setLocNo(loc.getLocNo());
- boolean save = locDetlService.save(locDetl);
- if (!save) {
- throw new CoolException("搴撳瓨璋冩暣澶辫触");
- }
-
- //鎻掑叆搴撳瓨鏄庣粏瀛楁
- for (MatField matField : matFields) {
- LocDetlField locDetlField = new LocDetlField();
- locDetlField.setDetlId(locDetl.getId());
- locDetlField.setFieldId(matField.getId());
- locDetlField.setName(matField.getName());
- locDetlField.setValue(Optional.ofNullable(uniqueFields.get(matField.getName()).toString()).orElse(""));
- locDetlFieldService.save(locDetlField);
- }
-
- }
-
- return R.ok();
}
}
--
Gitblit v1.9.1