From 5747655ff976c6226cf6e0ebcaef6d38d396bb9f Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期四, 09 九月 2021 10:42:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/PltBarcodeController.java | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PltBarcodeController.java b/src/main/java/com/zy/asrs/controller/PltBarcodeController.java
index 6a40f5b..826ace7 100644
--- a/src/main/java/com/zy/asrs/controller/PltBarcodeController.java
+++ b/src/main/java/com/zy/asrs/controller/PltBarcodeController.java
@@ -1,28 +1,42 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.PltBarcode;
-import com.zy.asrs.service.PltBarcodeService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.PltBarcode;
+import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.PltBarcodeService;
+import com.zy.asrs.service.WrkDetlService;
import com.zy.common.web.BaseController;
+import com.zy.ints.entity.WaitMatin;
+import com.zy.ints.service.WaitMatinService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class PltBarcodeController extends BaseController {
@Autowired
private PltBarcodeService pltBarcodeService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private WaitMatinService waitMatinService;
@RequestMapping(value = "/pltBarcode/{id}/auth")
@ManagerAuth
@@ -36,10 +50,12 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
EntityWrapper<PltBarcode> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
+ allLike(PltBarcode.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(pltBarcodeService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -76,9 +92,27 @@
@RequestMapping(value = "/pltBarcode/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- pltBarcodeService.deleteById(id);
+ public R delete(@RequestParam(value="ids[]") String[] ids){
+ for (String id : ids){
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",id));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",id));
+ if (countLoc > 0 || countWrk > 0) {
+ return R.error("宸ヤ綔妗ｆ垨搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�");
+ }else {
+// List<WaitMatin> waitMatins = waitMatinService.selectList();
+ List<PltBarcode> pltBarcodes = pltBarcodeService.selectList(new EntityWrapper<PltBarcode>().eq("barcode", id));
+ for(PltBarcode pltBarcode : pltBarcodes){
+ WaitMatin waitMatin = waitMatinService.selectOne(new EntityWrapper<WaitMatin>().eq("bill_no",pltBarcode.getBillNo())
+ .eq("seq_no",pltBarcode.getSeqNo()).eq("mat_no",pltBarcode.getMatNo()));
+ if(null != waitMatin){
+ waitMatin.setInQty(waitMatin.getInQty()-pltBarcode.getQty());
+ waitMatinService.update(waitMatin,new EntityWrapper<WaitMatin>().eq("bill_no",pltBarcode.getBillNo())
+ .eq("seq_no",pltBarcode.getSeqNo()).eq("mat_no",pltBarcode.getMatNo()));
+ }
+ }
+ pltBarcodeService.delete(new EntityWrapper<PltBarcode>().eq("barcode", id));
+ }
+// pltBarcodeService.deleteById(id);
}
return R.ok();
}
--
Gitblit v1.9.1