From 211ae7e060b36da7c1bc790c12ccd2159aaec011 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 12 十一月 2023 18:06:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 5 +
src/main/java/com/zy/common/entity/OutLocBoxExcel.java | 1
src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java | 7 ++
src/main/webapp/static/layuiadmin/json/forum/replys.js | 70 -----------------------
src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java | 62 +++++++++++++++++++-
5 files changed, 72 insertions(+), 73 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java b/src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java
index 1ceae65..1f6b3cf 100644
--- a/src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java
+++ b/src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java
@@ -13,6 +13,8 @@
@ExcelProperty(value = "绠卞彿")
private String batch;
+ @ExcelProperty(value = "璁㈠崟鍙�")
+ private String orderNo;
public OutLocBoxVo() {
}
@@ -21,4 +23,9 @@
this.batch = batch;
}
+ public OutLocBoxVo(String batch,String orderNo) {
+ this.batch = batch;
+ this.orderNo = orderNo;
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index a658772..59bb29a 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -185,9 +185,12 @@
@Override
@Transactional
public void startupFullTakeStoreOrder(StockOutParam param, Long userId) {
- if (Cools.isEmpty(param) || Cools.isEmpty(param.getOrderNo()) || Cools.isEmpty(param.getLocDetls())){
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getLocDetls())){
throw new CoolException("鍙傛暟涓虹┖");
}
+ if (Cools.isEmpty(param.getOrderNo())){
+ throw new CoolException("璁㈠崟鍙峰弬鏁颁负绌�");
+ }
DocType docType = docTypeService.selectOrAdd("鎵嬪姩鍑哄簱鍗�", Boolean.FALSE);
Order order = orderService.selectByNo(param.getOrderNo());
if (Cools.isEmpty(order)){
diff --git a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
index e0a4fd3..d037b41 100644
--- a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
@@ -2,10 +2,21 @@
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.R;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.param.StockOutParam;
+import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.TagService;
+import com.zy.asrs.service.WorkService;
import com.zy.common.entity.OutLocBoxExcel;
+import com.zy.common.model.LocDto;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
@@ -21,7 +32,7 @@
private int total = 0;
private Long userId;
- List<String> batchs = new ArrayList<>();
+ List<String[]> OutLocBoxCs = new ArrayList<>();
public OutLocBoxExcelListener() {
}
@@ -50,7 +61,11 @@
@Override
public void invoke(OutLocBoxExcel excel, AnalysisContext ctx) {
String batch = excel.getBatch();
- batchs.add(batch);
+ String orderNo = excel.getOrderNo();
+ String[] s=new String[2];
+ s[0] = batch;
+ s[1] = orderNo;
+ OutLocBoxCs.add(s);
total++;
}
@@ -60,7 +75,48 @@
*/
@Override
public void doAfterAllAnalysed(AnalysisContext ctx) {
- log.info("鐢熸垚{}鏉″嚭搴撲换鍔★紒", total);
+ if (!Cools.isEmpty(OutLocBoxCs) && OutLocBoxCs.size() != 0) {
+ LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
+ WorkService workService = SpringUtils.getBean(WorkService.class);
+ List<LocDto> locDtos = new ArrayList<>();
+ for (String[] outLocBoxC:OutLocBoxCs){
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", outLocBoxC[0]));
+ if (Cools.isEmpty(locDetl)){
+ total--;
+ continue;
+ }
+ LocDto locDto = new LocDto(locDetl.getManu(), locDetl.getMatnr(), locDetl.getMaktx(),locDetl.getModel(),locDetl.getSpecs(),
+ locDetl.getBatch(),locDetl.getBrand(),locDetl.getBarcode(), outLocBoxC[1],locDetl.getAnfme());
+ locDtos.add(locDto);
+ }
+
+ StockOutParam param = new StockOutParam();
+ ArrayList<StockOutParam.LocDetl> locDetls = new ArrayList<>();
+ for (LocDto locDto:locDtos){
+ StockOutParam.LocDetl locDetl = new StockOutParam.LocDetl();
+ locDetl.setBrand(locDto.getBrand());
+ locDetl.setLocNo(locDto.getLocNo());
+ locDetl.setAnfme(locDto.getAnfme());
+ locDetl.setMatnr(locDto.getMatnr());
+ locDetl.setBatch(locDto.getBatch());
+ locDetl.setModel(locDto.getModel());
+ locDetl.setSpecs(locDto.getSpecs());
+ locDetl.setZpallet(locDto.getZpallet());
+
+ param.setOrderNo(locDto.getOrderNo());
+
+ locDetls.add(locDetl);
+ }
+ param.setLocDetls(locDetls);
+
+ if (total>0){
+ workService.startupFullTakeStoreOrder(param,9999L);
+ }
+
+ }
+
+
+ log.info("瀵煎叆{}鏉＄鍙凤紒", total);
}
public int getTotal() {
diff --git a/src/main/java/com/zy/common/entity/OutLocBoxExcel.java b/src/main/java/com/zy/common/entity/OutLocBoxExcel.java
index 0f0e7a3..da20ef7 100644
--- a/src/main/java/com/zy/common/entity/OutLocBoxExcel.java
+++ b/src/main/java/com/zy/common/entity/OutLocBoxExcel.java
@@ -18,5 +18,6 @@
public class OutLocBoxExcel extends OutLocBoxVo {
private String batch;
+ private String orderNo;
}
diff --git a/src/main/webapp/static/layuiadmin/json/forum/replys.js b/src/main/webapp/static/layuiadmin/json/forum/replys.js
index 0703695..7e75a28 100644
--- a/src/main/webapp/static/layuiadmin/json/forum/replys.js
+++ b/src/main/webapp/static/layuiadmin/json/forum/replys.js
@@ -1,69 +1 @@
-{
- "code": 0
- ,"msg": ""
- ,"count": "100"
- ,"data": [{
- "id": "001"
- ,"replyer": "鍚�"
- ,"cardid": "1002"
- ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
- ,"content": "鏈夌溂鍏夛紝鎴戜篃鍠滄鑳℃瓕锛�"
- ,"replytime": 20161205
- },{
- "id": "002"
- ,"replyer": "閮�"
- ,"cardid": "1002"
- ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
- ,"content": "鍚屼笂鍚屼笂銆�"
- ,"replytime": 20161205
- },{
- "id": "003"
- ,"replyer": "鐜�"
- ,"cardid": "1003"
- ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
- ,"content": "鑳借繃涓�瀹氳繃锛屼笉鑳借繃绱у紶涔熸病鐢�"
- ,"replytime": 20170405
- },{
- "id": "004"
- ,"replyer": "鍐�"
- ,"cardid": "1001"
- ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
- ,"content": "鍙兘鍥犱负浣犳祦榧昏浜嗐��"
- ,"replytime": 20170405
- },{
- "id": "005"
- ,"replyer": "闄�"
- ,"cardid": "1003"
- ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
- ,"content": "鍔犳补鍔犳补锛岀湅濂戒綘"
- ,"replytime": 20170405
- },{
- "id": "006"
- ,"replyer": "瑜�"
- ,"cardid": "1005"
- ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
- ,"content": "绾睘鏀惧眮"
- ,"replytime": 20180207
- },{
- "id": "007"
- ,"replyer": "鍗�"
- ,"cardid": "1005"
- ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
- ,"content": "鍙互璇曡瘯"
- ,"replytime": 20180207
- },{
- "id": "006"
- ,"replyer": "钂�"
- ,"cardid": "1006"
- ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
- ,"content": "鏄晩鏄晩锛屽お鎭愭�栦簡銆�"
- ,"replytime": 20180512
- },{
- "id": "007"
- ,"replyer": "娌�"
- ,"cardid": "1008"
- ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
- ,"content": "榄忓鍑夌毊鐨勫噳鐨氨寰堜笉閿欏ゥ銆�"
- ,"replytime": 20180515
- }]
-}
\ No newline at end of file
+{"code":0,"msg":"","count":"100","data":[{"id":"001","replyer":"鍚�","cardid":"1002","avatar":"https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg","content":"鏈夌溂鍏夛紝鎴戜篃鍠滄鑳℃瓕锛�","replytime":20161205},{"id":"002","replyer":"閮�","cardid":"1002","avatar":"https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg","content":"鍚屼笂鍚屼笂銆�","replytime":20161205},{"id":"003","replyer":"鐜�","cardid":"1003","avatar":"https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg","content":"鑳借繃涓�瀹氳繃锛屼笉鑳借繃绱у紶涔熸病鐢�","replytime":20170405},{"id":"004","replyer":"鍐�","cardid":"1001","avatar":"https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg","content":"鍙兘鍥犱负浣犳祦榧昏浜嗐��","replytime":20170405},{"id":"005","replyer":"闄�","cardid":"1003","avatar":"https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg","content":"鍔犳补鍔犳补锛岀湅濂戒綘","replytime":20170405},{"id":"006","replyer":"瑜�","cardid":"1005","avatar":"https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg","content":"绾睘鏀惧眮","replytime":20180207},{"id":"007","replyer":"鍗�","cardid":"1005","avatar":"https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg","content":"鍙互璇曡瘯","replytime":20180207},{"id":"006","replyer":"钂�","cardid":"1006","avatar":"https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg","content":"鏄晩鏄晩锛屽お鎭愭�栦簡銆�","replytime":20180512},{"id":"007","replyer":"娌�","cardid":"1008","avatar":"https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg","content":"榄忓鍑夌毊鐨勫噳鐨氨寰堜笉閿欏ゥ銆�","replytime":20180515}]}
\ No newline at end of file
--
Gitblit v1.9.1