From 4c8c41b153db001d80a990090e2cce1669af72dc Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 22 五月 2023 17:04:13 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/ManLocDetlMapper.xml | 45 +++
src/main/java/com/zy/asrs/controller/OpenController.java | 20 -
src/main/webapp/static/js/order/order.js | 2
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 351 ++++++++++++++++-------------
src/main/java/com/zy/asrs/service/ManLocDetlService.java | 6
src/main/java/com/zy/asrs/controller/MobileController.java | 18 +
src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java | 15 +
src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java | 6
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 209 -----------------
src/main/java/com/zy/asrs/service/OpenService.java | 4
src/main/java/com/zy/asrs/service/MobileService.java | 5
11 files changed, 288 insertions(+), 393 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 1e98b5e..232ba46 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -340,4 +340,22 @@
return R.ok("鍑哄簱鎴愬姛");
}
+ //骞冲簱pda涓婃灦
+ @RequestMapping("/manDetl/in")
+ public R manDetlAdd(@RequestBody JSONObject json){
+ if (json == null){
+ return R.error("浼犲叆鏁版嵁涓虹┖");
+ }
+ return mobileService.manDetlIn(json);
+ }
+
+ //骞冲簱pda涓嬫灦
+ @RequestMapping("/manDetl/out")
+ public R manDetlDelete(@RequestBody JSONObject json){
+ if (json == null){
+ return R.error("浼犲叆鏁版嵁涓虹┖");
+ }
+ return mobileService.manDetlOut(json);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 5ec0d66..5430a22 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -172,24 +172,4 @@
System.out.println(JSON.toJSONString(param1));
}
-
- @RequestMapping("/manDetl/in")
- public R manDetlAdd(@RequestBody JSONObject json){
- if (json == null){
- return R.error("浼犲叆鏁版嵁涓虹┖");
- }
- return openService.manDetlIn(json);
- }
-
-
- @RequestMapping("/manDetl/out")
- public R manDetlDelete(@RequestBody JSONObject json){
- if (json == null){
- return R.error("浼犲叆鏁版嵁涓虹┖");
- }
- return openService.manDetlOut(json);
- }
-
-
-
}
diff --git a/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
index 250a289..9114e18 100644
--- a/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
@@ -83,4 +83,10 @@
List<ManLocDetl> selectAllPage(Map<String, Object> condition);
long selectAllPageSize(Map<String, Object> condition);
+
+ ManLocDetl selectInventory(String LocNo, String Matnr, String batch);
+
+ int deleteDatailed (String locNo, String matnr,String batch);
+
+ int increase(Double anfme,String locNo, String matnr,String batch);
}
diff --git a/src/main/java/com/zy/asrs/service/ManLocDetlService.java b/src/main/java/com/zy/asrs/service/ManLocDetlService.java
index 4530bbc..1170144 100644
--- a/src/main/java/com/zy/asrs/service/ManLocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/ManLocDetlService.java
@@ -62,4 +62,10 @@
Page<ManLocDetl> selectAllPage(Page<ManLocDetl> param);
+ ManLocDetl selectInventory(String LocNo,String Matnr,String batch);
+
+ int deleteDatailed (String locNo, String matnr,String batch);
+
+ int increase(Double anfme,String locNo, String matnr,String batch);
+
}
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 973abec..c1cd82b 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service;
import com.alibaba.fastjson.JSONObject;
+import com.core.common.R;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.OrderDetl;
@@ -38,4 +39,8 @@
void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
Double curOutQty, Integer ioType, Long userId, Date now);
+
+ R manDetlIn(JSONObject json);
+
+ R manDetlOut(JSONObject json);
}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index be4655c..e6233e5 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -46,8 +46,4 @@
void syncMat(MatSyncParam param);
R getInOutDetl();
-
- R manDetlIn(JSONObject json);
-
- R manDetlOut(JSONObject json);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
index 1f566fe..f42392f 100644
--- a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
@@ -186,5 +186,20 @@
return param;
}
+ @Override
+ public ManLocDetl selectInventory(String LocNo, String Matnr, String batch) {
+ return baseMapper.selectInventory(LocNo,Matnr,batch);
+ }
+
+ @Override
+ public int deleteDatailed(String locNo, String matnr, String batch) {
+ return baseMapper.deleteDatailed(locNo,matnr,batch);
+ }
+
+ @Override
+ public int increase(Double anfme,String locNo, String matnr, String batch) {
+ return baseMapper.increase(anfme,locNo,matnr,batch);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 7450d05..b965eab 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -21,6 +22,7 @@
import com.zy.common.model.MesCombParam;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
+import com.zy.common.utils.Synchro;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -58,9 +60,9 @@
@Autowired
private OpenService openService;
@Autowired
- private SnowflakeIdWorker snowflakeIdWorker;
+ private DocTypeService docTypeService;
@Autowired
- private ApiLogService apiLogService;
+ private ManPakOutService manPakOutService;
@Autowired
private BasCrnpService basCrnpService;
@Autowired
@@ -354,163 +356,6 @@
}
-// @Override
-// @Transactional
-// public void packComb(CombParam param, Long userId) {
-// if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
-// throw new CoolException(BaseRes.PARAM);
-// }
-// // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
-// if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
-// eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
-// throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
-// }
-// Date now = new Date();
-//
-// boolean packDown = Parameter.get().getPackDown().equals("true");
-//
-// // 鏃犲崟缁勬墭
-// if (Cools.isEmpty(param.getOrderNo())) {
-//
-// // 鐢熸垚鍏ュ簱閫氱煡妗�
-// List<DetlDto> detlDtos = new ArrayList<>();
-// param.getCombMats().forEach(elem -> {
-// // 鎵撳寘涓婄嚎鏁版嵁鏍￠獙
-// if (packDown) {
-// Pack pack = packService.selectByBarcode(elem.getMatnr());
-// if (pack == null) {
-// throw new CoolException(elem.getMatnr() + "鏉＄爜鍐椾綑锛岃妫�鏌ワ紒");
-// }
-// if (pack.getSettle() != 1) {
-// throw new CoolException(elem.getMatnr() + "鏉＄爜宸蹭笅绾匡紝璇锋鏌ワ紒");
-// }
-// }
-// Mat analyse = MatUtils.analyseMat(elem.getMatnr());
-// // 鏉＄爜銆佺墿鏂欎唬鐮併�佸簭鍒楀彿銆佹暟閲�
-// DetlDto detlDto = new DetlDto(elem.getMatnr(), analyse.getMatnr(), analyse.getBarcode(), elem.getAnfme());
-//// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
-// if (DetlDto.has(detlDtos, detlDto)) {
-// DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
-// assert one != null;
-// one.setAnfme(one.getAnfme() + detlDto.getAnfme());
-// } else {
-// detlDtos.add(detlDto);
-// }
-// });
-//
-// if (packDown) {
-// MesCombParam mesCombParam = new MesCombParam();
-// mesCombParam.setZpallet(param.getBarcode());
-// mesCombParam.setPakinTime(DateUtils.convert(now));
-// mesCombParam.setLgort("5008");
-// mesCombParam.setPlantCode("5000");
-// mesCombParam.setFromCode("5012-20");
-// mesCombParam.setStationCode("JJQ-PFZPDB-XX");
-// for (DetlDto detlDto : detlDtos) {
-// mesCombParam.getList().add(new MesCombParam.Detl(detlDto.getOrderNo(), detlDto.getAnfme()));
-// }
-// String response = "";
-// boolean success = false;
-// try {
-// response = new HttpHandler.Builder()
-// .setUri(MesConstant.URL)
-// .setPath(MesConstant.PACK_DOWN_URL)
-// .setJson(JSON.toJSONString(mesCombParam))
-// .build()
-// .doPost();
-// JSONObject jsonObject = JSON.parseObject(response);
-// if (jsonObject.getInteger("code").equals(200)) {
-// success = true;
-// } else if (jsonObject.getInteger("code").equals(500)) {
-// log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
-// throw new CoolException(jsonObject.getString("msg"));
-// } else {
-// log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
-// throw new CoolException("涓婃姤mes绯荤粺澶辫触");
-// }
-// } catch (Exception e) {
-// log.error("fail", e);
-// throw new CoolException(e.getMessage());
-// } finally {
-// try {
-// // 淇濆瓨鎺ュ彛鏃ュ織
-// apiLogService.save(
-// "鎵撳寘涓嬬嚎甯墭涓婃姤",
-// MesConstant.URL + MesConstant.PACK_DOWN_URL,
-// null,
-// "127.0.0.1",
-// JSON.toJSONString(mesCombParam),
-// response,
-// success
-// );
-// } catch (Exception e) { log.error("", e); }
-// }
-//
-// }
-//
-// // 鐢熸垚鍏ュ簱鍗曟嵁
-// String orderNo = "PACK" + snowflakeIdWorker.nextId();
-// OpenOrderPakinParam openParam = new OpenOrderPakinParam();
-// openParam.setOrderNo(orderNo);
-// openParam.setOrderTime(DateUtils.convert(now));
-// openParam.setOrderType("鎵撳寘鍏ュ簱鍗�");
-// openParam.setOrderDetails(detlDtos);
-// openService.pakinOrderCreate(openParam);
-// Order order = orderService.selectByNo(orderNo);
-// if (null == order) {
-// throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
-// }
-// if (!orderService.updateSettle(order.getId(), 2L, userId)) {
-// throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
-// }
-//
-// // 鐢熸垚鍏ュ簱閫氱煡妗�
-// for (DetlDto detlDto : detlDtos) {
-//
-// // 淇敼浣滀笟鏁伴噺 ----------------------------------------
-// // 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
-// OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch());
-// if (detlDto.getAnfme() > orderDetl.getEnableQty()) {
-// throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
-// }
-// // 淇敼璁㈠崟浣滀笟鏁伴噺
-// if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
-// throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
-// }
-//
-// // 淇濆瓨鍏ュ簱閫氱煡妗�
-// Mat mat = matService.selectByMatnr(detlDto.getMatnr());
-// if (Cools.isEmpty(mat)) {
-// throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
-// }
-// WaitPakin waitPakin = new WaitPakin();
-// waitPakin.sync(mat);
-// waitPakin.setOrderNo(orderNo);
-// waitPakin.setBatch(detlDto.getBatch());
-// waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
-// waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
-// waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
-// waitPakin.setStatus("Y"); // 鐘舵��
-// waitPakin.setAppeUser(userId);
-// waitPakin.setAppeTime(now);
-// waitPakin.setModiUser(userId);
-// waitPakin.setModiTime(now);
-// if (!waitPakinService.insert(waitPakin)) {
-// throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
-// }
-// // 淇敼鎵撳寘鏁版嵁鐘舵��
-// Pack pack = packService.selectByBarcode(detlDto.getOrderNo());
-// pack.setSettle(2L);
-// pack.setUpdateTime(now);
-// pack.setUpdateBy(userId);
-// if (!packService.updateById(pack)) {
-// throw new CoolException("淇敼鎵撳寘鏁版嵁寮傚父");
-// }
-// }
-//
-// }
-// }
-
@Override
@Transactional
public void pakoutByOrder(JSONObject param, Long userId) {
@@ -648,4 +493,192 @@
throw new CoolException(locDetl.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
}
}
+
+ @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));
+ JSONArray combMats = json.getJSONArray("combMats");
+ for (int i = 0; i < combMats.size(); i++) {
+ OrderDetl jsonOrderDetl = combMats.getObject(i, OrderDetl.class);
+
+ //鏌ヨ鍗�
+ Order order = orderService.selectOne(new EntityWrapper<Order>()
+ .eq("order_no", jsonOrderDetl.getOrderNo()));
+ if (Cools.isEmpty(node, order)) {
+ return R.error("鍙傛暟涓虹┖");
+ }
+
+ //鍒ゆ柇璁㈠崟绫诲瀷鏄惁鏄叆搴�
+ DocType docType=docTypeService.selectById(order.getDocType());
+ if(docType.getPakin()!=1 || docType.getStatus()!=1){
+ return R.error("璇ヨ鍗曟槸鍑哄簱璁㈠崟锛屾棤娉曞叆搴�");
+ }
+
+ OrderDetl orderDetl = orderDetlService.selectItem(jsonOrderDetl.getOrderNo(),jsonOrderDetl.getMatnr(),jsonOrderDetl.getBatch());
+ if (Cools.isEmpty(orderDetl)) {
+ return R.error("鍗曟嵁鏄庣粏鏈夎,璇锋鏌�");
+ }
+ if (orderDetl.getAnfme() - (jsonOrderDetl.getAnfme() + orderDetl.getWorkQty()) < 0) {
+ return R.error("鍏ュ簱鏁伴噺澶т簬鍙叆鏁伴噺");
+ }
+ //鏌ヨ骞冲簱涓槸鍚︽湁涓�鏍风殑鐗╂枡鍙凤紝鏈夌殑璇濈洿鎺ュ鍔犳暟閲�
+ ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),jsonOrderDetl.getBatch());
+ 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);
+ manLocDetl.setBatch(jsonOrderDetl.getBatch());
+ if(!manLocDetlService.insert(manLocDetl)){
+ return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
+ }
+ } else {
+ if(manLocDetlService.increase(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme(), jsonOrderDetl.getOrderNo(), jsonOrderDetl.getMaktx(), jsonOrderDetl.getBatch())<=0){
+ return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
+ }
+ }
+ orderDetl.setQty(orderDetl.getQty() + jsonOrderDetl.getAnfme());
+ orderDetl.setWorkQty(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme());
+ orderDetl.setUpdateTime(date);
+ orderDetlService.updateById(orderDetl);
+ //鏇存柊璁㈠崟鐘舵��
+ List<OrderDetl> orderDetls=orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",order.getOrderNo()));
+ order.setSettle(2L);
+ boolean log=true;
+ for (OrderDetl orderDetl1: orderDetls) {
+ //宸ヤ綔涓殑鏁伴噺灏忎簬鎬昏鍗曟暟鏃讹紝璁㈠崟鐘舵�佹敼涓�2锛屼綔涓氫腑
+ if(orderDetl1.getQty() < orderDetl.getAnfme()){
+ log=false;
+ }
+ }
+ if(log){
+ 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));
+ JSONArray combMats = json.getJSONArray("combMats");
+ for (int i = 0; i < combMats.size(); i++) {
+ OrderDetl jsonOrderDetl = combMats.getObject(i, OrderDetl.class);
+ Order order = orderService.selectOne(new EntityWrapper<Order>()
+ .eq("order_no", jsonOrderDetl.getOrderNo()));
+
+ //鍒ゆ柇璁㈠崟绫诲瀷鏄惁鏄嚭搴�
+ DocType docType=docTypeService.selectById(order.getDocType());
+ if(docType.getPakout()!=1 || docType.getStatus()!=1){
+ return R.error("璇ヨ鍗曟槸鍏ュ簱璁㈠崟锛屾棤娉曞嚭搴�");
+ }
+ if (Cools.isEmpty(node, order)) {
+ return R.error("鍙傛暟涓虹┖");
+ }
+ OrderDetl orderDetl = orderDetlService.selectItem(jsonOrderDetl.getOrderNo(),jsonOrderDetl.getMatnr(),jsonOrderDetl.getMaktx());
+ if (Cools.isEmpty(orderDetl)) {
+ return R.error("鍗曟嵁鏄庣粏鏈夎,璇锋鏌�");
+ }
+ EntityWrapper<ManPakOut> manPakOutEntityWrapper = new EntityWrapper<>();
+ manPakOutEntityWrapper.eq("loc_no",jsonLocNo);
+ manPakOutEntityWrapper.eq("matnr",jsonOrderDetl.getMatnr());
+ ManPakOut manPakOut = manPakOutService.selectOne(manPakOutEntityWrapper); //鑾峰彇鎷ｈ揣鍗曚腑鐨勫搴旂殑璁㈠崟
+ if(manPakOut.getCount() == null){
+ manPakOut.setCount(0);
+ }
+// if (jsonOrderDetl.getAnfme() > manPakOut.getAnfme()) { //鍒ゆ柇宸ヤ綔鏁伴噺鏄惁澶т簬鎷ｈ揣鍗曠殑鏁伴噺
+// return R.error("鍑哄簱鏁伴噺澶т簬鎷ｈ揣鍗曟�绘暟閲�");
+// }
+ if (jsonOrderDetl.getAnfme() > (manPakOut.getAnfme()-manPakOut.getCount())) { //鍒ゆ柇宸ヤ綔鏁伴噺鏄惁澶т簬鎷ｈ揣鍗曞墿浣欏彲鍑虹殑鏁伴噺
+ return R.error("鍑哄簱鏁伴噺澶т簬鎷ｈ揣鍗曞墿浣欏彲鍑烘暟閲�");
+ }
+ if (orderDetl.getWorkQty() - orderDetl.getQty() <jsonOrderDetl.getAnfme() ){
+ return R.error("鍑哄簱鏁伴噺澶т簬鍗曟嵁鍓╀綑鍙嚭鏁伴噺");
+ }
+ //鏌ヨ骞冲簱涓槸鍚︽湁涓�鏍风殑鐗╂枡鍙�
+ ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),orderDetl.getBatch());
+ if (checkManLocDetl == null) {
+ return R.error("璇ュ簱浣嶆病鏈夊嚭搴撶殑鐗╂枡淇℃伅");
+ }
+ if (jsonOrderDetl.getAnfme() > checkManLocDetl.getAnfme()) {
+ return R.error("鍑哄簱鏁伴噺澶т簬鍙嚭鏁伴噺");
+ }
+ Double finalQty = checkManLocDetl.getAnfme() - jsonOrderDetl.getAnfme();
+ if (finalQty < 0){
+ // if(manLocDetlService.deleteDatailed(jsonLocNo, jsonOrderDetl.getMatnr(), jsonOrderDetl.getBatch())<=0) {
+ return R.error("鏁伴噺鏈夎锛�");
+ // }
+ }else {
+ if(manLocDetlService.increase(finalQty, jsonLocNo, jsonOrderDetl.getMatnr(), jsonOrderDetl.getBatch())<=0){
+ return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
+ }
+ }
+ orderDetl.setQty(orderDetl.getQty() + jsonOrderDetl.getAnfme());
+ orderDetl.setUpdateTime(date);
+ orderDetlService.updateById(orderDetl);
+ //鏇存柊璁㈠崟鐘舵��
+ List<OrderDetl> orderDetls=orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",order.getOrderNo()));
+ order.setSettle(2L);
+ boolean log=true;
+ for (OrderDetl orderDetl1: orderDetls) {
+ //宸ヤ綔涓殑鏁伴噺灏忎簬鎬昏鍗曟暟鏃讹紝璁㈠崟鐘舵�佹敼涓�2锛屼綔涓氫腑
+ if(orderDetl1.getQty() < orderDetl.getAnfme()){
+ log=false;
+ }
+ }
+ if(log){
+ order.setSettle(4L);
+ }
+ if(!orderService.updateById(order)){
+ return R.error("鏇存柊璁㈠崟鐘舵�佸け璐�");
+ }
+ if(manPakOut.getCount() == null){
+ manPakOut.setCount(0);
+ }
+ manPakOut.setCount(manPakOut.getCount()+jsonOrderDetl.getAnfme().intValue());
+ if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){
+ return R.error("鏇存柊鎷ｈ揣鍗曞畬鎴愭暟鐩け璐�");
+ }
+ if (manPakOut.getAnfme().intValue() == manPakOut.getCount()){
+ manPakOut.setStatus(1);
+ if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){
+ return R.error("鏇存柊鎷ｈ揣鍗曠姸鎬佸け璐�");
+ }
+ }
+ EntityWrapper<ManLocDetl> manLocDetlEntityWrapper = new EntityWrapper<>();
+ manLocDetlEntityWrapper.eq("loc_no",manPakOut.getLocNo());
+ manLocDetlEntityWrapper.eq("matnr",manPakOut.getMatnr());
+ if (checkManLocDetl.getAnfme().intValue() == manPakOut.getCount()){
+
+
+ if(!manLocDetlService.delete(manLocDetlEntityWrapper)){
+ return R.error("鍒犻櫎骞冲簱搴撳瓨澶辫触");
+ }
+ }else{
+ checkManLocDetl.setStatus(1);
+ if(!manLocDetlService.update(checkManLocDetl,manLocDetlEntityWrapper)){
+ return R.error("鏇存柊骞冲簱搴撳瓨鐘舵�佸け璐�");
+ }
+ }
+
+ }
+ return R.ok("涓嬫灦瀹屾垚");
+ }
}
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 a722014..858d596 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -157,52 +157,6 @@
}
}
-// @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
public void pakoutOrderCreate(OpenOrderPakoutParam param) {
@@ -293,51 +247,6 @@
}
}
}
-
-// @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
@@ -576,124 +485,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("鍙傛暟涓虹┖");
- }
-
- 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);
-
- }
- 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("鍙傛暟涓虹┖");
- }
-
- 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("鍗曟嵁鏄庣粏鏈夎,璇锋鏌�");
- }
- EntityWrapper<ManPakOut> manPakOutEntityWrapper = new EntityWrapper<>();
- manPakOutEntityWrapper.eq("loc_no",jsonLocNo);
- manPakOutEntityWrapper.eq("matnr",jsonOrderDetl.getMatnr());
- ManPakOut manPakOut = manPakOutService.selectOne(manPakOutEntityWrapper); //鑾峰彇鎷ｈ揣鍗曚腑鐨勫搴旂殑璁㈠崟
- if (jsonOrderDetl.getAnfme() > (manPakOut.getAnfme()-manPakOut.getCount())) { //鍒ゆ柇宸ヤ綔鏁伴噺鏄惁澶т簬鎷ｈ揣鍗曞墿浣欏彲鍑虹殑鏁伴噺
- 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("涓嬫灦瀹屾垚");
}
}
diff --git a/src/main/resources/mapper/ManLocDetlMapper.xml b/src/main/resources/mapper/ManLocDetlMapper.xml
index 125456a..121d2d0 100644
--- a/src/main/resources/mapper/ManLocDetlMapper.xml
+++ b/src/main/resources/mapper/ManLocDetlMapper.xml
@@ -325,4 +325,49 @@
where node_id = #{nodeId} ;
</update>
+ <select id="selectInventory" resultMap="BaseResultMap">
+ select top 1 * from man_loc_detl
+ where loc_no=#{LocNo}
+ and 1=1
+ and matnr=#{Matnr}
+ <choose>
+ <when test="batch != null and batch != ''">
+ and batch = #{batch}
+ </when>
+ <otherwise>
+ and (batch IS NULL OR batch = '')
+ </otherwise>
+ </choose>
+ </select>
+ <delete id="deleteDatailed">
+ delete from man_loc_detl
+ where loc_no = #{locNo}
+ and matnr = #{matnr}
+ <choose>
+ <when test="batch != null and batch != ''">
+ and batch = #{batch}
+ </when>
+ <otherwise>
+ and (batch IS NULL OR batch = '')
+ </otherwise>
+ </choose>
+ </delete>
+
+ <update id="increase">
+ update man_loc_detl
+ set anfme= #{anfme}
+ , modi_time = getdate()
+ where 1=1
+ and loc_no = #{locNo}
+ and matnr = #{matnr}
+ <choose>
+ <when test="batch != null and batch!='' ">
+ and maktx = #{batch}
+ </when>
+ <otherwise>
+ and (batch IS NULL OR batch = '')
+ </otherwise>
+ </choose>
+ </update>
+
</mapper>
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 3a7bc90..201c3ca 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -193,7 +193,7 @@
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
{field: 'batch', title: '鎵瑰彿'},
{field: 'anfme', title: '鏁伴噺'},
- // {field: 'workQty', title: '浣滀笟鏁伴噺'},
+ {field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
// {field: 'unit', title: '鍗曚綅'},
// {
--
Gitblit v1.9.1