From f6513ffa7e2efe2a4dc81626c7aab9cf643f8f41 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 14 三月 2024 10:14:28 +0800
Subject: [PATCH] 1.增加牌号作为唯一物料条件 （当前牌号 批号 包号可以筛选出唯一物料） 2.增加移库接口 3.订单出库可替换物料 4.页面ui完善
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 271 ++++++++++++-----------------------------------------
1 files changed, 64 insertions(+), 207 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 7c0de39..09473ad 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,7 +1,5 @@
package com.zy.asrs.service.impl;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -11,15 +9,13 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.InOutCountDto;
-import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
+import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
-import com.zy.asrs.utils.Utils;
import com.zy.common.model.DetlDto;
import com.zy.common.utils.NodeUtils;
-import com.zy.common.utils.Synchro;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -60,6 +56,12 @@
private NodeService nodeService;
@Autowired
private ManLocDetlService manLocDetlService;
+ @Autowired
+ private ManPakOutService manPakOutService;
+ @Autowired
+ private LocOwnerService locOwnerService;
+ @Autowired
+ private ReportQueryMapper reportQueryMapper;
@Override
@Transactional
@@ -67,6 +69,19 @@
Order order = orderService.selectByNo(param.getOrderNo());
if (!Cools.isEmpty(order)) {
throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
+ }
+
+ for (DetlDto detlDto : param.getOrderDetails()){
+ if (Cools.isEmpty(detlDto) || Cools.isEmpty(detlDto.getOwnerName(),detlDto.getPayment())){
+ throw new CoolException(param.getOrderNo() + "缂哄皯璐т富鎴栬揣鐗╁舰鎬�");
+ }else {
+ LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", detlDto.getOwnerName()));
+ if (Cools.isEmpty(locOwner)){
+ LocOwner locOwner1 = new LocOwner();
+ locOwner1.setOwner(detlDto.getOwnerName());
+ locOwnerService.insert(locOwner1);
+ }
+ }
}
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
Date now = new Date();
@@ -114,7 +129,7 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getOwnerName(),detail.getPayment());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -122,6 +137,7 @@
} else {
list.add(dto);
}
+ dto.setWeight(detail.getWeight());
}
for (DetlDto detlDto : list) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
@@ -145,59 +161,21 @@
orderDetl.setCreateTime(now);
orderDetl.setUpdateBy(9527L);
orderDetl.setUpdateTime(now);
+ LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", detlDto.getOwnerName()));
+ if (Cools.isEmpty(locOwner)){
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }else {
+ orderDetl.setOwner(locOwner.getId().intValue());
+ }
+ orderDetl.setPayment(detlDto.getPayment());
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setWeight(detlDto.getWeight());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
}
-
-// @Override
-// @Transactional
-// public List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param) {
-// List<OpenOrderCompeteResult> results = new ArrayList<>();
-// if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
-// // 鎸囧畾璁㈠崟
-// Order order = orderService.selectByNo(param.getOrderNo());
-// if (null != order) {
-// OpenOrderCompeteResult result = new OpenOrderCompeteResult();
-// results.add(result);
-// result.setOrderNo(order.getOrderNo());
-// result.setOrderTime(order.getOrderTime());
-// result.setOrderType(order.getDocType$());
-// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-// for (OrderDetl orderDetl : orderDetls) {
-// result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
-// }
-// if (order.getSettle() == 4L) {
-// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-// if (!orderService.updateSettle(order.getId(), 6L, null)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// }
-// }
-// }
-// } else {
-// // 鎵�鏈夎鍗�
-// List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
-// for (Order order : orders) {
-// OpenOrderCompeteResult result = new OpenOrderCompeteResult();
-// results.add(result);
-// result.setOrderNo(order.getOrderNo());
-// result.setOrderTime(order.getOrderTime());
-// result.setOrderType(order.getDocType$());
-// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-// for (OrderDetl orderDetl : orderDetls) {
-// result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
-// }
-// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-// if (!orderService.updateSettle(order.getId(), 6L, null)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// }
-// }
-// }
-// return results;
-// }
@Override
@Transactional
@@ -264,6 +242,7 @@
} else {
list.add(dto);
}
+ dto.setWeight(detail.getWeight());
}
for (DetlDto detlDto : list) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
@@ -282,61 +261,17 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setWeight(detlDto.getWeight());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
}
-// @Override
-// public List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param) {
-// List<OpenOrderCompeteResult> results = new ArrayList<>();
-// if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
-// // 鎸囧畾璁㈠崟
-// Order order = orderService.selectByNo(param.getOrderNo());
-// if (null != order) {
-// OpenOrderCompeteResult result = new OpenOrderCompeteResult();
-// results.add(result);
-// result.setOrderNo(order.getOrderNo());
-// result.setOrderTime(order.getOrderTime());
-// result.setOrderType(order.getDocType$());
-// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-// for (OrderDetl orderDetl : orderDetls) {
-// result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
-// }
-// if (order.getSettle() == 4L) {
-// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-// if (!orderService.updateSettle(order.getId(), 6L, null)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// }
-// }
-// }
-// } else {
-// // 鎵�鏈夎鍗�
-// List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
-// for (Order order : orders) {
-// OpenOrderCompeteResult result = new OpenOrderCompeteResult();
-// results.add(result);
-// result.setOrderNo(order.getOrderNo());
-// result.setOrderTime(order.getOrderTime());
-// result.setOrderType(order.getDocType$());
-// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-// for (OrderDetl orderDetl : orderDetls) {
-// result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
-// }
-// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-// if (!orderService.updateSettle(order.getId(), 6L, null)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// }
-// }
-// }
-// return results;
-// }
-
@Override
@Transactional
- public List<StockVo> queryStock() {
- return locDetlService.queryStockTotal();
+ public List<StockVo> queryStock(StockVo stockVo) {
+ return locDetlService.queryStockTotal(stockVo);
}
@Override
@@ -548,6 +483,9 @@
mat.setStatus(1);
mat.setCreateTime(now);
mat.setUpdateTime(now);
+ if (Cools.isEmpty(matParam.getLength()) || matParam.getLength() == 0) {
+ mat.setLength(null);
+ }
if (!matService.insert(mat)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
} else {
@@ -569,118 +507,37 @@
return R.ok().add(top100);
}
- @Transactional
+ /*
+ * 閫熻吘鏁板瓧瀛敓璋冪敤鎺ュ彛
+ * */
@Override
- public R manDetlIn(JSONObject json) {
- Date date = new Date();
- String jsonLocNo = (String) json.get("locNo");
- Node node = nodeService.selectOne(new EntityWrapper<Node>()
- .eq("name", jsonLocNo));
-
- String jsonOrderNo = (String) json.get("orderNo");
- Order order = orderService.selectOne(new EntityWrapper<Order>()
- .eq("order_no", jsonOrderNo));
- if (Cools.isEmpty(node, order)) {
- return R.error("鍙傛暟涓虹┖");
+ public DigitalTwin inventoryQuantity() {
+ DigitalTwin digitalTwin = new DigitalTwin();
+ LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
+ LocChartPie locUseRateL = reportQueryMapper.getLocUseRateL();
+ LocChartPie locUseRateP = reportQueryMapper.getLocUseRateP();
+ if(locUseRate!=null) {
+ digitalTwin.setCount(locUseRate.getOqty()+locUseRate.getFqty()+locUseRate.getUqty()+locUseRate.getXqty());
+ digitalTwin.setOqty(locUseRate.getOqty());
+ digitalTwin.setFqty(locUseRate.getFqty());
+ digitalTwin.setUqty(locUseRate.getUqty());
+ digitalTwin.setXqty(locUseRate.getXqty());
}
-
- JSONArray combMats = json.getJSONArray("combMats");
- for (int i = 0; i < combMats.size(); i++) {
- OrderDetl jsonOrderDetl = combMats.getObject(i, OrderDetl.class);
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
- .eq("order_no", jsonOrderNo));
- if (Cools.isEmpty(orderDetl)) {
- return R.error("鍗曟嵁鏄庣粏鏈夎,璇锋鏌�");
- }
- if (orderDetl.getAnfme() - (jsonOrderDetl.getAnfme() + orderDetl.getQty()) < 0) {
- return R.error("鍏ュ簱鏁伴噺澶т簬鍙叆鏁伴噺");
- }
- ManLocDetl checkManLocDetl = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
- .eq("loc_no", jsonLocNo)
- .eq("matnr", orderDetl.getMatnr()));
- if (checkManLocDetl == null) {
- ManLocDetl manLocDetl = new ManLocDetl();
- Synchro.Copy(orderDetl, manLocDetl);
- manLocDetl.setLocNo(node.getName());
- manLocDetl.setNodeId(node.getId());
- manLocDetl.setMatnr(orderDetl.getMatnr());
- manLocDetl.setMaktx(orderDetl.getMaktx());
- manLocDetl.setAnfme(orderDetl.getAnfme());
- manLocDetl.setModiTime(date);
- manLocDetl.setCreateTime(date);
- manLocDetlService.insert(manLocDetl);
- } else {
- checkManLocDetl.setAnfme(checkManLocDetl.getAnfme() + orderDetl.getAnfme());
- checkManLocDetl.setModiTime(date);
- manLocDetlService.update(checkManLocDetl, new EntityWrapper<ManLocDetl>()
- .eq("loc_no", jsonLocNo)
- .eq("matnr", orderDetl.getMatnr()));
- }
-
- orderDetl.setQty(orderDetl.getQty() + jsonOrderDetl.getAnfme());
- orderDetl.setUpdateTime(date);
- orderDetlService.updateById(orderDetl);
-
+ if(locUseRateL!=null) {
+ digitalTwin.setCountL(locUseRateL.getOqty()+locUseRateL.getFqty()+locUseRateL.getUqty()+locUseRateL.getXqty());
+ digitalTwin.setOqtyL(locUseRateL.getOqty());
+ digitalTwin.setFqtyL(locUseRateL.getFqty());
+ digitalTwin.setUqtyL(locUseRateL.getUqty());
+ digitalTwin.setXqtyL(locUseRateL.getXqty());
}
- orderService.checkComplete(order.getOrderNo());
-
-
- return R.ok("涓婃灦瀹屾垚");
- }
-
- @Transactional
- @Override
- public R manDetlOut(JSONObject json) {
- Date date = new Date();
- String jsonLocNo = (String) json.get("locNo");
- Node node = nodeService.selectOne(new EntityWrapper<Node>()
- .eq("name", jsonLocNo));
- String jsonOrderNo = (String) json.get("orderNo");
- Order order = orderService.selectOne(new EntityWrapper<Order>()
- .eq("order_no", jsonOrderNo));
- if (Cools.isEmpty(node, order)) {
- return R.error("鍙傛暟涓虹┖");
+ if (locUseRateP!=null){
+ digitalTwin.setCountP(locUseRateP.getOqty()+locUseRateP.getFqty()+locUseRateP.getUqty()+locUseRateP.getXqty());
+ digitalTwin.setOqtyP(locUseRateP.getOqty());
+ digitalTwin.setFqtyP(locUseRateP.getFqty());
+ digitalTwin.setUqtyP(locUseRateP.getUqty());
+ digitalTwin.setXqtyP(locUseRateP.getXqty());
}
-
- JSONArray combMats = json.getJSONArray("combMats");
- for (int i = 0; i < combMats.size(); i++) {
- OrderDetl jsonOrderDetl = combMats.getObject(i, OrderDetl.class);
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
- .eq("order_no", jsonOrderNo));
- if (Cools.isEmpty(orderDetl)) {
- return R.error("鍗曟嵁鏄庣粏鏈夎,璇锋鏌�");
- }
- if (jsonOrderDetl.getAnfme() > (orderDetl.getAnfme() - orderDetl.getQty())) {
- return R.error("鍑哄簱鏁伴噺澶т簬鍗曟嵁鍙嚭鏁伴噺");
- }
- ManLocDetl manLocDetl = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
- .eq("loc_no", jsonLocNo)
- .eq("matnr", orderDetl.getMatnr()));
- if (manLocDetl == null) {
- return R.error("璇ュ簱浣嶆病鏈夊嚭搴撶殑鐗╂枡淇℃伅");
- }
- if (jsonOrderDetl.getAnfme() > manLocDetl.getAnfme()) {
- return R.error("鍑哄簱鏁伴噺澶т簬鍙嚭鏁伴噺");
- }
- Double finalQty = manLocDetl.getAnfme() - jsonOrderDetl.getAnfme();
- if (finalQty <= 0){
- manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
- .eq("loc_no", jsonLocNo)
- .eq("matnr", orderDetl.getMatnr()));
- }else {
- manLocDetl.setAnfme(finalQty);
- manLocDetl.setModiTime(date);
- manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>()
- .eq("loc_no", jsonLocNo)
- .eq("matnr", orderDetl.getMatnr()));
- }
- orderDetl.setQty(orderDetl.getQty() + jsonOrderDetl.getAnfme());
- orderDetl.setUpdateTime(date);
- orderDetlService.updateById(orderDetl);
-
- orderService.checkComplete(order.getOrderNo());
- }
- return R.ok("涓嬫灦瀹屾垚");
+ return digitalTwin;
}
}
--
Gitblit v1.9.1