From ce7bc4497e63231850e5df3a8843b348f9587b6b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 27 九月 2023 14:58:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index bd592bb..be943bb 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -1,7 +1,9 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
@@ -11,6 +13,7 @@
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.service.*;
+import com.zy.common.model.DetlDto;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -161,6 +164,13 @@
public R comb(@RequestBody CombParam combParam){
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
+ }
+
+ @RequestMapping("/comb/2auth")
+ @ManagerAuth(memo = "缁勬墭")
+ public R comb2(@RequestBody CombParam combParam){
+ mobileService.pikingToFull2(1);
+ return R.ok(mobileService.pikingToFull2(3732));
}
@RequestMapping("/pack/get/auth")
@@ -409,7 +419,20 @@
public synchronized R pickAuth(@RequestBody String barcode){
WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
- return R.ok().add(wrkDetls);
+ ArrayList<WrkDetl> resultwrkDetls = new ArrayList<>();
+ for (WrkDetl wrkDetl : wrkDetls) {
+ if (isJSON(wrkDetl.getOrderNo())) {
+ JSON.parseArray(wrkDetl.getOrderNo(), DetlDto.class).forEach(detlDto -> {
+ WrkDetl clone = wrkDetl.clone();
+ clone.setOrderNo(detlDto.getOrderNo());
+ clone.setAnfme(detlDto.getAnfme());
+ resultwrkDetls.add(clone);
+ });
+ } else {
+ resultwrkDetls.add(wrkDetl);
+ }
+ }
+ return R.ok().add(resultwrkDetls);
}
@RequestMapping("/order/search/orderNo/auth/v2")
--
Gitblit v1.9.1