From 7541db2b7b5eccc91fb8454a89318706e77a6088 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 03 二月 2024 10:45:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 181 +++++----------------------------------------
1 files changed, 20 insertions(+), 161 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 8407805..f4ed538 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -60,6 +60,8 @@
private NodeService nodeService;
@Autowired
private ManLocDetlService manLocDetlService;
+ @Autowired
+ private MatV2Service matV2Service;
@Override
@Transactional
@@ -125,11 +127,16 @@
}
for (DetlDto detlDto : list) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
+ if (Cools.isEmpty(mat)) {
+ MatV2 matV2 = matV2Service.selectOne(new EntityWrapper<MatV2>().eq("matnr", detlDto.getMatnr()));
+ if(Cools.isEmpty(matV2)){
+ throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ }
+ orderDetl.sync(matV2);
+ } else {
+ orderDetl.sync(mat);
+ }
//鎵瑰彿涓虹┖浼氬嚭鐜伴棶棰橈紝璁剧疆涓�涓粯璁ゅ��
if (detlDto.getBatch() == null) {
@@ -267,11 +274,16 @@
}
for (DetlDto detlDto : list) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
+ if (Cools.isEmpty(mat)) {
+ MatV2 matV2 = matV2Service.selectOne(new EntityWrapper<MatV2>().eq("matnr", detlDto.getMatnr()));
+ if(Cools.isEmpty(matV2)){
+ throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ }
+ orderDetl.sync(matV2);
+ } else {
+ orderDetl.sync(mat);
+ }
orderDetl.setBatch(detlDto.getBatch() == null ? "" : detlDto.getBatch());
orderDetl.setAnfme(detlDto.getAnfme());
orderDetl.setOrderId(order.getId());
@@ -567,159 +579,6 @@
public R getInOutDetl() {
List<InOutCountDto> top100 = wrkMastService.selectTop100();
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("鍙傛暟涓虹┖");
- }
-
- //鍒ゆ柇璁㈠崟绫诲瀷鏄惁鏄叆搴�
- DocType docType=docTypeService.selectById(order.getDocType());
- if(docType.getPakin()!=1 || docType.getStatus()!=1){
- return R.error("璇ヨ鍗曟槸鍑哄簱璁㈠崟锛屾棤娉曞叆搴�");
- }
-
- 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)
- .and()
- .eq("maktx",jsonOrderDetl.getMaktx()));
- if (Cools.isEmpty(orderDetl)) {
- return R.error("鍗曟嵁鏄庣粏鏈夎,璇锋鏌�");
- }
- if (orderDetl.getAnfme() - (jsonOrderDetl.getAnfme() + orderDetl.getWorkQty()) < 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(jsonOrderDetl.getMaktx());
- manLocDetl.setAnfme(jsonOrderDetl.getAnfme());
- manLocDetl.setModiTime(date);
- manLocDetl.setCreateTime(date);
- manLocDetlService.insert(manLocDetl);
- } else {
- checkManLocDetl.setAnfme(checkManLocDetl.getAnfme() + jsonOrderDetl.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.setWorkQty(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme());
- orderDetl.setUpdateTime(date);
- orderDetlService.updateById(orderDetl);
-
- //鏇存柊璁㈠崟鐘舵��
- //宸ヤ綔涓殑鏁伴噺灏忎簬鎬昏鍗曟暟鏃讹紝璁㈠崟鐘舵�佹敼涓�2锛屼綔涓氫腑
- if(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme() < orderDetl.getAnfme()){
- order.setSettle(2L);
- }else{
- //宸ヤ綔涓殑鏁伴噺绛変簬鎬昏鍗曟暟鏃讹紝璁㈠崟鐘舵�佹敼涓�4,瀹屾垚
- order.setSettle(4L);
- }
- if(!orderService.updateById(order)){
- return R.error("鏇存柊璁㈠崟鐘舵�佸け璐�");
- }
-
- }
- 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));
-
- //鍒ゆ柇璁㈠崟绫诲瀷鏄惁鏄叆搴�
- DocType docType=docTypeService.selectById(order.getDocType());
- if(docType.getPakout()!=1 || docType.getStatus()!=1){
- return R.error("璇ヨ鍗曟槸鍑哄簱璁㈠崟锛屾棤娉曞叆搴�");
- }
- if (Cools.isEmpty(node, order)) {
- return R.error("鍙傛暟涓虹┖");
- }
-
- 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.getWorkQty())) {
- 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.setWorkQty(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme());
- orderDetl.setUpdateTime(date);
- orderDetlService.updateById(orderDetl);
-
- //鏇存柊璁㈠崟鐘舵��
- //宸ヤ綔涓殑鏁伴噺灏忎簬鎬昏鍗曟暟鏃讹紝璁㈠崟鐘舵�佹敼涓�2锛屼綔涓氫腑
- if(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme() < orderDetl.getAnfme()){
- order.setSettle(2L);
- }else{
- //宸ヤ綔涓殑鏁伴噺绛変簬鎬昏鍗曟暟鏃讹紝璁㈠崟鐘舵�佹敼涓�4,瀹屾垚
- order.setSettle(4L);
- }
- if(!orderService.updateById(order)){
- return R.error("鏇存柊璁㈠崟鐘舵�佸け璐�");
- }
-
- orderService.checkComplete(order.getOrderNo());
- }
- return R.ok("涓嬫灦瀹屾垚");
}
}
--
Gitblit v1.9.1