From 971dc3eb422fb38ffe8205ed60283c85036fde36 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 03 九月 2025 17:10:58 +0800
Subject: [PATCH] 许可证有效期”改成“仓储系统许可有效期
---
src/main/java/com/zy/asrs/controller/MobileController.java | 91 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 85 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 232ba46..05eada1 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -23,6 +23,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
import java.util.*;
/**
@@ -95,16 +96,23 @@
return R.ok();
}
List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
- if (Cools.isEmpty(orderDetls)) {
+ ArrayList<OrderDetl> orderDetls2 = new ArrayList<>();
+ for (OrderDetl orderDetl : orderDetls){
+ orderDetl.setAnfme(new BigDecimal(orderDetl.getAnfme()).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue());
+ orderDetl.setWorkQty(new BigDecimal(orderDetl.getWorkQty()).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue());
+ orderDetl.setQty(new BigDecimal(orderDetl.getQty()).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue());
+ orderDetls2.add(orderDetl);
+ }
+ if (Cools.isEmpty(orderDetls) || Cools.isEmpty(orderDetls2)) {
return R.ok();
}
- return R.ok().add(orderDetls);
+ return R.ok().add(orderDetls2);
}
@RequestMapping("/comb/auth")
- @ManagerAuth(memo = "缁勬墭")
+// @ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam){
- mobileService.comb(combParam, getUserId());
+ mobileService.comb(combParam, 9527L);
return R.ok("缁勬墭鎴愬姛");
}
@@ -342,20 +350,91 @@
//骞冲簱pda涓婃灦
@RequestMapping("/manDetl/in")
+ @ManagerAuth(memo = "璁㈠崟涓婃灦")
public R manDetlAdd(@RequestBody JSONObject json){
if (json == null){
return R.error("浼犲叆鏁版嵁涓虹┖");
}
- return mobileService.manDetlIn(json);
+ return mobileService.manDetlIn(json, getUser());
}
//骞冲簱pda涓嬫灦
@RequestMapping("/manDetl/out")
+ @ManagerAuth(memo = "璁㈠崟涓嬫灦")
public R manDetlDelete(@RequestBody JSONObject json){
if (json == null){
return R.error("浼犲叆鏁版嵁涓虹┖");
}
- return mobileService.manDetlOut(json);
+ return mobileService.manDetlOut(json , getUser());
+ }
+ @RequestMapping("/manDetl/barcode/out")
+ @ManagerAuth(memo = "璁㈠崟涓嬫灦(鎵樼洏鐮�)")
+ public R barcodeDelete(@RequestBody JSONObject json){
+ if (json == null){
+ return R.error("浼犲叆鏁版嵁涓虹┖");
+ }
+ return mobileService.barcodeDelete(json , getUser());
+ }
+
+ @RequestMapping("/manDetl/in/barcode")
+ @ManagerAuth(memo = "璁㈠崟涓婃灦(鎵樼洏鐮�)")
+ public R manDetlAddbarcode(@RequestBody JSONObject json){
+ if (json == null){
+ return R.error("浼犲叆鏁版嵁涓虹┖");
+ }
+ return mobileService.manDetlInBarcode(json,getUser());
+ }
+
+ @RequestMapping("/piking/auth")
+ @ManagerAuth
+ @Transactional
+ public R pikingAuth(String barcode) {
+ WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
+ if (Cools.isEmpty(wrkMast)) {
+ throw new CoolException(barcode + "鏆傛棤宸ヤ綔妗�");
+ }
+ if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107){
+ throw new CoolException(barcode + "涓嶄负鎷ｆ枡/鐩樼偣鍑哄簱");
+ }
+
+ if (wrkMast.getIoType() == 107){
+ wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("zpallet",barcode));
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("zpallet", barcode));
+ for (LocDetl locDetl : locDetls) {
+ String uuid = String.valueOf(System.currentTimeMillis());
+ WrkDetl wrkDetl = new WrkDetl();
+ Date now = new Date();
+ wrkDetl.sync(locDetl);
+ wrkDetl.setZpallet(wrkMast.getBarcode());
+ wrkDetl.setIoTime(now);
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setBatch(locDetl.getBatch());
+ wrkDetl.setOrderNo(locDetl.getOrderNo());
+ wrkDetl.setAnfme(locDetl.getAnfme()); // 鏁伴噺
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setAppeUser(9527L);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setModiUser(9527L);
+ wrkDetl.setUuid(uuid);
+ wrkDetl.setOwner(locDetl.getOwner());
+ wrkDetl.setPayment(locDetl.getPayment());
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
+ }
+ }
+ wrkMast.setIoType(101);
+ if (!wrkMastService.updateById(wrkMast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝");
+ }
+ LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
+ locMast.setLocSts("R");
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locMast.getLocNo());
+ }
+
+
+ return R.ok();
}
}
--
Gitblit v1.9.1