From 00b8e7a256d8508043784f061a4afe5b1107d9aa Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 02 二月 2024 16:10:54 +0800
Subject: [PATCH] 1.layui版本更新 2.固定表格 显示表格合计信息
---
src/main/java/com/zy/asrs/controller/MobileController.java | 277 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 264 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index e0ce184..083be11 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -1,23 +1,26 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.MobileAdjustParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.MobileAdjustResult;
+import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
+import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
import java.util.*;
/**
@@ -37,6 +40,8 @@
@Autowired
private OrderService orderService;
@Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
private DocTypeService docTypeService;
@Autowired
private WrkMastService wrkMastService;
@@ -46,6 +51,28 @@
private BasDevpService basDevpService;
@Autowired
private PackService packService;
+ @Autowired
+ private ManLocDetlMapper manLocDetlMapper;
+ @Autowired
+ private PlaService plaService;
+
+
+ // 鍟嗗搧涓婃灦
+ @RequestMapping("/mat/onSale/auth")
+ @ManagerAuth
+ public R matOnSale(@RequestBody CombParam combParam){
+ mobileService.onSale(combParam);
+ return R.ok("涓婃灦鎴愬姛");
+ }
+ // 鍟嗗搧涓嬫灦
+ @RequestMapping("/mat/offSale/auth")
+ //@ManagerAuth
+ public R matOffSale(@RequestBody OffSaleParam offSaleParam){
+ mobileService.offSale(offSaleParam);
+ return R.ok("涓嬫灦鎴愬姛");
+ }
+
+
// 缁勬墭 ----------------------------------------------------------------------------------------------------
@@ -68,10 +95,17 @@
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")
@@ -97,7 +131,7 @@
@RequestMapping("/pack/comb/auth")
@ManagerAuth(memo = "涓嬬嚎缁勬墭")
public R packComb(@RequestBody CombParam combParam){
- mobileService.packComb(combParam, getUserId());
+// mobileService.packComb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
@@ -141,10 +175,20 @@
if (wrkMast != null) {
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
// 鍘婚櫎宸插嚭搴撶‘璁ょ殑鏄庣粏
- wrkDetls.removeIf(wrkDetl -> wrkDetl.getInspect() == 1);
+ wrkDetls.removeIf(wrkDetl -> wrkDetl.getInspect() != null && wrkDetl.getInspect() != 0);
return R.ok().add(Cools.add("wrkNo", wrkMast.getWrkNo()).add("ioType", wrkMast.getIoType()).add("list", wrkDetls));
}
return R.ok();
+ }
+
+ // 鏍规嵁搴撲綅鐮佸拰鍟嗗搧鐮佹悳绱㈠晢鍝�
+ @RequestMapping("/mat/find/auth")
+ public R find(@RequestParam(required = false) String locNo
+ , @RequestParam(required = false) String matnr){
+ //List<ManLocDetl> manLocDetls = manLocDetlMapper.selectItem0(locNo, matnr);
+ ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(locNo, matnr);
+ return R.ok(manLocDetl);
+ //return R.ok(manLocDetlMapper.selectItem0(locNo, matnr));
}
/**
@@ -197,12 +241,46 @@
if (Cools.isEmpty(list)) {
return R.ok();
}
- // todo:luxiaotao 鎷ｆ枡鍑哄簱鍙慨鏀瑰伐浣滄。鏄庣粏
Set<Integer> wrkNos = new HashSet<>();
+ List<WrkDto> dtos = new ArrayList<>();
for (WrkDetl wrkDetl : list) {
- wrkNos.add(wrkDetl.getWrkNo());
- wrkDetlService.updateInspect(wrkDetl.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ if (wrkNos.contains(wrkDetl.getWrkNo())) {
+ for (WrkDto dto : dtos) {
+ if (dto.getWrkNo().equals(wrkDetl.getWrkNo())) {
+ dto.getWrkDetls().add(wrkDetl);
+ break;
+ }
+ }
+ } else {
+ wrkNos.add(wrkDetl.getWrkNo());
+ dtos.add(new WrkDto(wrkDetl.getWrkNo(), wrkDetl));
+ }
}
+
+ for (WrkDto dto : dtos) {
+ WrkMast wrkMast = wrkMastService.selectById(dto.getWrkNo());
+ if (wrkMast != null) {
+ // 101
+ if (wrkMast.getIoType() == 101) {
+ for (WrkDetl wrkDetl : dto.getWrkDetls()) {
+ wrkDetlService.updateInspect(wrkDetl.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ }
+ }
+ // 103
+ if (wrkMast.getIoType() == 103) {
+ if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
+ throw new CoolException("鎷ｆ枡鍑哄簱纭澶辫触");
+ }
+ for (WrkDetl wrkDetl : dto.getWrkDetls()) {
+ wrkDetl.setInspect(1);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("鎷ｆ枡鍑哄簱纭澶辫触");
+ }
+ }
+ }
+ }
+ }
+
for (Integer wrkNo : wrkNos) {
WrkMast wrkMast = wrkMastService.selectById(wrkNo);
if (wrkMast.getWrkSts() == 14 && (Cools.isEmpty(wrkMast.getInvWh()) || wrkMast.getInvWh().equals("N"))) {
@@ -259,5 +337,178 @@
return R.ok("鐩樼偣鎴愬姛");
}
+ @RequestMapping("/adjustNew/auth")
+ @ManagerAuth(memo = "pda鐩樼偣")
+ public R adjustNew(@RequestBody MobileAdjustNewParam combParam){
+ mobileService.adjustNew(combParam, getUserId());
+ return R.ok("鐩樼偣鎴愬姛");
+ }
+
+ @PostMapping("/order/out/pakout/auth")
+ @ManagerAuth(memo = "璁㈠崟鍑哄簱")
+ public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
+ if(!param.containsKey("staNo") || !param.containsKey("orderNo")){
+ return R.parse(BaseRes.PARAM);
+ }
+ mobileService.pakoutByOrder(param,getUserId());
+ return R.ok("鍑哄簱鎴愬姛");
+ }
+
+ //骞冲簱pda涓婃灦
+ @RequestMapping("/manDetl/in")
+ @ManagerAuth(memo = "璁㈠崟涓婃灦")
+ public R manDetlAdd(@RequestBody JSONObject json){
+ if (json == null){
+ return R.error("浼犲叆鏁版嵁涓虹┖");
+ }
+ 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 , 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("/manDetl/in/origin")
+ @ManagerAuth(memo = "骞冲簱涓婃灦")
+ public R manDetlIn(@RequestBody JSONObject json){
+ if (json == null){
+ return R.error("浼犲叆鏁版嵁涓虹┖");
+ }
+ return mobileService.manDetlOrigin(json,getUser());
+ }
+
+ @RequestMapping("/manDetl/in/no/origin")
+ @ManagerAuth(memo = "骞冲簱涓婃灦")
+ public R manDetlInNo(@RequestBody JSONObject json){
+ if (json == null){
+ return R.error("浼犲叆鏁版嵁涓虹┖");
+ }
+ return mobileService.manDetlOrigInNo(json,getUser());
+ }
+
+// @RequestMapping("/manDetl/out/origin")
+// @ManagerAuth(memo = "骞冲簱涓嬫灦")
+// public R manDetlout(@RequestBody JSONObject json){
+// if (json == null){
+// return R.error("浼犲叆鏁版嵁涓虹┖");
+// }
+// return mobileService.manDetlOriginOut(json,getUser());
+// }
+
+ @RequestMapping("/manDetl/out/origin")
+ @ManagerAuth(memo = "骞冲簱涓嬫灦")
+ public R manDetlout2(@RequestBody JSONObject json){
+ if (json == null){
+ return R.error("浼犲叆鏁版嵁涓虹┖");
+ }
+ return mobileService.manDetlOriginOut(json,getUser());
+ }
+
+ @RequestMapping("/plaDetl/packin/v1")
+ //@ManagerAuth(memo="pla鍏ュ簱")
+ public R plaPackIn(@RequestBody JSONObject json){
+ String locNo = json.get("locNo").toString();
+ JSONArray jsonArray = JSONArray.parseArray(json.getJSONArray("pla").toJSONString());
+ for (Object o : jsonArray){
+ JSONObject jsonObject = (JSONObject)o;
+ String batch = jsonObject.get("batch").toString();
+ String packageNo = jsonObject.get("packageNo").toString();
+ if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
+ return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
+ }
+ //娴嬭瘯
+ if(true){
+ User user = new User();
+ user.setUsername("test");
+ mobileService.plaPakin(locNo,batch,packageNo,user);
+ }
+ }
+ return R.ok("鍏ュ簱鎴愬姛");
+ }
+
+ @RequestMapping("/plaDetl/packout1/v1")
+// @ManagerAuth(memo="pla鍑哄簱")
+ public R plaPackOut1(@RequestBody JSONObject json){
+ String locNo = json.get("locNo").toString();
+ String batch = json.get("batch").toString();
+ String packageNo = json.get("packageNo").toString();
+ String orderNo = json.get("orderNo").toString();
+ String orderDetlId = json.get("orderDetlId").toString();
+ String wrkNo = json.get("wrkNo").toString();
+ Double anfme = Double.parseDouble(json.get("anfme").toString());
+
+ if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
+ return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
+ }
+
+ mobileService.plaPakout(locNo,batch,packageNo,orderNo,orderDetlId,wrkNo,anfme);
+ return R.ok();
+ }
+
+ @RequestMapping("/plaDetl/packout/v1")
+// @ManagerAuth(memo="pla鍑哄簱")
+ public R plaPackOut(@RequestBody JSONObject json){
+ String locNo = json.get("locNo").toString();
+ String batch = json.get("batch").toString();
+ String packageNo = json.get("packageNo").toString();
+ String orderNo = json.get("orderNo").toString();
+ String orderDetlId = json.get("orderDetlId").toString();
+ String wrkNo = json.get("wrkNo").toString();
+ Double anfme = Double.parseDouble(json.get("anfme").toString());
+
+ if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
+ return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
+ }
+
+ mobileService.plaPakout(locNo,batch,packageNo,orderNo,orderDetlId,wrkNo,anfme);
+ return R.ok();
+ }
+
+
+ @RequestMapping("/plaDetl/check/v1")
+ public R plaDetlCheck(@RequestBody JSONObject json){
+ String batch = json.get("batch").toString();
+ String packageNo = json.get("packageNo").toString();
+
+ if(Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
+ return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
+ }
+
+ Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
+ if ((Cools.isEmpty(pla))){
+ return R.error("璇ュ寘鐗╂枡鏈綍鍏ワ紝鏃犳硶鏌ヨ鍒扮浉鍏充俊鎭�");
+ }
+ if(!Cools.eq(pla.getStatus(), GlobleParameter.PLA_STATUS_0)){
+ return R.error("璇ュ寘鐗╂枡涓嶄负寰呭叆搴撶姸鎬侊紝鏃犳硶杩涜鍏ュ簱鎿嶄綔");
+ }
+ return R.ok(pla);
+ }
+
+ public static void main(String[] args) {
+// String aa = "[{\"batch\":\"2023090304\",\"packageNo\":\"8\"},{\"batch\":\"2023090304\",\"packageNo\":\"8\"}]";
+// JSONArray jsonArray = JSON.parseArray(aa);
+// Object o = jsonArray.get(0);
+// System.out.println(o.toString());
+// JSONObject jsonObject = (JSONObject)o;
+// System.out.println(jsonObject);
+
+ String s = "2024010502";
+ System.out.println(s.substring(8,10));
+ }
}
--
Gitblit v1.9.1