From 83b51a5a0774ea8ecb9a06304af3b956a21307c8 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期六, 08 三月 2025 09:06:55 +0800
Subject: [PATCH] CUT库条码T开头，截取后10位
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WorkController.java | 117 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 81 insertions(+), 36 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 17d3e81..7c6220a 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
@@ -1,36 +1,81 @@
-package com.zy.asrs.wms.asrs.controller;
-
-import com.zy.asrs.framework.common.R;
-import com.zy.asrs.wms.asrs.entity.param.GeneratePakInParam;
-import com.zy.asrs.wms.asrs.service.WorkService;
-import com.zy.asrs.wms.common.annotation.OperationLog;
-import com.zy.asrs.wms.system.controller.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/api")
-public class WorkController extends BaseController {
-
- @Autowired
- private WorkService workService;
-
- @OperationLog("鐢熸垚鍏ュ簱浠诲姟")
- @PostMapping("/rpc/generatePakIn")
- public R generatePakIn(@RequestBody GeneratePakInParam param) {
- try {
- if (param.getTaskType() == 10) {
- workService.generateEmptyPakIn(param);//绌烘墭鐩�
- }else {
- workService.generatePakIn(param);//婊℃墭鐩�
- }
- return R.ok("娣诲姞鎴愬姛");
- } catch (Exception e) {
- return R.error(e.getMessage());
- }
- }
-
-}
+package com.zy.asrs.wms.asrs.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.*;
+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;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+
+@RestController
+@RequestMapping("/api")
+public class WorkController extends BaseController {
+
+ @Autowired
+ private WorkService workService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private LocService locService;
+ @Autowired
+ private MatFieldService matFieldService;
+ @Autowired
+ private LocDetlFieldService locDetlFieldService;
+
+ @OperationLog("鐢熸垚鍏ュ簱浠诲姟")
+ @PostMapping("/rpc/generatePakIn")
+ public R generatePakIn(@RequestBody GeneratePakInParam param) {
+ try {
+ if (param.getTaskType() == 10) {
+ workService.generateEmptyPakIn(param);//绌烘墭鐩�
+ }else {
+ workService.generatePakIn(param);//婊℃墭鐩�
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ } catch (Exception e) {
+ return R.error(e.getMessage());
+ }
+ }
+
+ @OperationLog("搴撳瓨璋冩暣")
+ @PostMapping("/loc/adjust")
+ @Transactional
+ public R locAdjust(@RequestBody LocAdjustParam param) {
+ try {
+ workService.locAdjust(param);
+ return R.ok();
+ } catch (Exception e) {
+ return R.error(e.getMessage());
+ }
+ }
+
+ @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());
+ }
+ }
+
+}
--
Gitblit v1.9.1