From 6b8690656814f44d642cc1cfc22de6e7c0923614 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 12 一月 2026 10:16:46 +0800
Subject: [PATCH] 出入库流程优化
---
src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java | 2
src/main/java/com/zy/api/controller/params/ReceviceTaskParams.java | 3
src/main/resources/mapper/LocDetlMapper.xml | 16 ++--
src/main/java/com/zy/api/controller/HmesApiController.java | 7 +-
src/main/webapp/static/js/order/order.js | 12 ----
src/main/resources/application-dev.yml | 2
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 80 ++++++++++++++++----------
7 files changed, 64 insertions(+), 58 deletions(-)
diff --git a/src/main/java/com/zy/api/controller/HmesApiController.java b/src/main/java/com/zy/api/controller/HmesApiController.java
index d81a743..3ac42f5 100644
--- a/src/main/java/com/zy/api/controller/HmesApiController.java
+++ b/src/main/java/com/zy/api/controller/HmesApiController.java
@@ -9,6 +9,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -31,7 +32,7 @@
@ManagerAuth
@ApiOperation("涓嬪彂鐢熶骇浠诲姟")
@PostMapping("/work/tasks")
- public R menauWork(ReceviceTaskParams params) {
+ public R menauWork(@RequestBody ReceviceTaskParams params) {
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -50,9 +51,9 @@
* @return com.core.common.R
*/
@ManagerAuth
- @ApiOperation("涓嬪彂鐢熶骇浠诲姟")
+ @ApiOperation("绌跨嚎瀹屾垚")
@PostMapping("/work/release/lock")
- public R releaseLock(ReceviceTaskParams params) {
+ public R releaseLock(@RequestBody ReceviceTaskParams params) {
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
diff --git a/src/main/java/com/zy/api/controller/params/ReceviceTaskParams.java b/src/main/java/com/zy/api/controller/params/ReceviceTaskParams.java
index b22c06e..42def1c 100644
--- a/src/main/java/com/zy/api/controller/params/ReceviceTaskParams.java
+++ b/src/main/java/com/zy/api/controller/params/ReceviceTaskParams.java
@@ -1,9 +1,8 @@
package com.zy.api.controller.params;
-import io.swagger.annotations.Api;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
import lombok.Data;
import lombok.experimental.Accessors;
diff --git a/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java
index 3881dc5..c4d0687 100644
--- a/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java
@@ -123,7 +123,7 @@
}
});
- wcsApiService.reportLockLocs(locs, "lock");
+// wcsApiService.reportLockLocs(locs, "lock");
return R.ok("閲婃斁鎴愬姛 锛侊紒");
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 15ef7cc..7d19bc6 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
+import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
@@ -13,6 +14,7 @@
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.OrderInAndOutUtil;
+import com.zy.common.CodeRes;
import com.zy.common.constant.MesConstant;
import com.zy.common.model.DetlDto;
import com.zy.common.model.MesPakinParam;
@@ -56,6 +58,10 @@
@Autowired
private OrderDetlPakinService orderDetlPakinService;
@Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
private MatService matService;
@@ -67,7 +73,7 @@
}
Order order1 = OrderInAndOutUtil.selectByNo(order.getPakinPakoutStatus$(), order.getOrderNo());
- if (!Cools.isEmpty(order1)){
+ if (!Cools.isEmpty(order1)) {
return FAIL.setMsg("璇风瓑寰�...璁㈠崟鎵ц妗ｆ姝ｅ湪杞巻鍙叉。妗堬紒锛侊紒");
}
List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
@@ -77,12 +83,12 @@
// 鍗曟嵁鏄庣粏妗�
List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
- for (OrderDetl orderDetl : orderDetlList){
- if (orderDetl.getQty().equals(0D)){
+ for (OrderDetl orderDetl : orderDetlList) {
+ if (orderDetl.getQty().equals(0D)) {
continue;
}
orderDetl.setWorkQty(orderDetl.getQty());
- orderDetl.setAnfme(orderDetl.getAnfme()-orderDetl.getQty());
+ orderDetl.setAnfme(orderDetl.getAnfme() - orderDetl.getQty());
orderDetl.setQty(0D);
orderDetlService.updateById(orderDetl);
}
@@ -96,6 +102,7 @@
/**
* 涓婃姤鍗曟嵁杞墽琛屽崟鎹�
+ *
* @author Ryan
* @date 2026/1/5 14:07
*/
@@ -109,20 +116,20 @@
//璁剧疆涓哄崟鎹墽琛屼腑
order.setSettle(2L);
- OrderInAndOutUtil.insertOrder(order.getPakinPakoutStatus$(),order);
+ OrderInAndOutUtil.insertOrder(order.getPakinPakoutStatus$(), order);
// 鍗曟嵁鏄庣粏妗�
List<DetlDto> list = new ArrayList<>();
List<OrderDetl> orderDetlList = new ArrayList<>();
for (OrderDetl detail : orderDetls) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),
- detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(),
+ detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
if (DetlDto.has(list, dto)) {
- DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
+ DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
- OrderDetl orderDetl = OrderDetl.find(orderDetlList, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
+ OrderDetl orderDetl = OrderDetl.find(orderDetlList, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
assert orderDetl != null;
orderDetl.setAnfme(orderDetl.getAnfme() + detail.getAnfme());
} else {
@@ -130,23 +137,29 @@
orderDetlList.add(detail);
}
}
- for (OrderDetl orderDetl : orderDetlList){
+ for (OrderDetl orderDetl : orderDetlList) {
orderDetl.setWorkQty(0D);
- OrderInAndOutUtil.insertOrderDetl(order.getPakinPakoutStatus$(),order,orderDetl);
+ OrderInAndOutUtil.insertOrderDetl(order.getPakinPakoutStatus$(), order, orderDetl);
}
OrderPakin pakinOrder = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", order.getOrderNo()));
- if (Objects.isNull(pakinOrder)){
- return FAIL.setMsg("鍏ュ簱鍗曟嵁涓嶅瓨鍦紒锛侊紒");
- }
+ if (Objects.isNull(pakinOrder)) {
+ return FAIL.setMsg("鍏ュ簱鍗曟嵁涓嶅瓨鍦紒锛侊紒");
+ }
//濡傛灉涓哄叆搴撳崟 PakinPakoutStatus = 1锛屽崟鎹敓鎴愬畬姣曞悗锛岀敓鎴愬叆搴撶粍鎵樻。銆�
- if (pakinOrder.getPakinPakoutStatus().equals(1)){
+ if (pakinOrder.getPakinPakoutStatus().equals(1)) {
List<OrderDetlPakin> pakinOrderDetls = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_id", pakinOrder.getId()));
if (!Objects.isNull(pakinOrderDetls) && !pakinOrderDetls.isEmpty()) {
pakinOrderDetls.forEach(orderDetl -> {
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",orderDetl.getBarcode()));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",orderDetl.getBarcode()));
+ int coutPakin = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", orderDetl.getBarcode()));
+ if (countLoc > 0 || countWrk > 0 || coutPakin > 0) {
+ throw new CoolException(CodeRes.EXIST_500);
+ }
WaitPakin waitPakin = new WaitPakin();
BeanUtils.copyProperties(orderDetl, waitPakin);
Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", orderDetl.getMatnr()));
- if (Objects.isNull(matnr)){
+ if (Objects.isNull(matnr)) {
throw new CoolException(orderDetl.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
if (!Objects.isNull(orderDetl.getBarcode()) && !orderDetl.getBarcode().isEmpty()) {
@@ -182,32 +195,32 @@
return SUCCESS;
}
Order orderSou = orderService.selectByNo(order.getOrderNo());
- if (!orderSou.getSettle().equals(2L)){
+ if (!orderSou.getSettle().equals(2L)) {
return FAIL.setMsg("璁㈠崟鐘舵�佷笉姝ｇ‘锛岃鑱旂郴绠＄悊鍛�");
}
List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(orderSou.getId());
List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
- for (OrderDetl orderDetlSou : orderDetlList){
- for (OrderDetl orderDetl : orderDetls){
- if (orderDetl.getQty().equals(0D)){
+ for (OrderDetl orderDetlSou : orderDetlList) {
+ for (OrderDetl orderDetl : orderDetls) {
+ if (orderDetl.getQty().equals(0D)) {
continue;
}
- if (orderDetlSou.beSimilar(orderDetl)){
+ if (orderDetlSou.beSimilar(orderDetl)) {
double v = orderDetlSou.getAnfme() - orderDetlSou.getQty();
- if (v<orderDetl.getQty() || orderDetl.getQty().equals(v)){
+ if (v < orderDetl.getQty() || orderDetl.getQty().equals(v)) {
orderDetlSou.setQty(orderDetlSou.getAnfme());
orderDetl.setQty(orderDetl.getQty() - v);
break;
} else {
- orderDetlSou.setQty(orderDetlSou.getQty()+orderDetl.getQty());
+ orderDetlSou.setQty(orderDetlSou.getQty() + orderDetl.getQty());
orderDetl.setQty(0D);
}
}
}
}
- for (OrderDetl orderDetlSou : orderDetlList){
+ for (OrderDetl orderDetlSou : orderDetlList) {
orderDetlService.updateById(orderDetlSou);
}
// 淇敼璁㈠崟鐘舵�� 2.浣滀笟涓� ===>> 4.寰呬笂鎶�
@@ -215,9 +228,10 @@
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.缁撴潫
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+ OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 6L, null);
return SUCCESS;
}
+
@Transactional
public ReturnT<String> startOrderReport(Order order) {
DocType docType = docTypeService.selectById(order.getDocType());
@@ -233,7 +247,7 @@
pakinParam.setLgortFrom("5008");
pakinParam.setLgortTo("5006");
for (OrderDetl orderDetl : orderDetls) {
- if (!orderDetl.getQty().equals(orderDetl.getAnfme())){
+ if (!orderDetl.getQty().equals(orderDetl.getAnfme())) {
settle = 99L;//浜屾鐢熸垚鍗曟嵁
}
String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
@@ -258,7 +272,7 @@
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
} else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(pakinParam), response);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.PAKIN_URL, JSON.toJSONString(pakinParam), response);
throw new CoolException("涓婃姤mes绯荤粺澶辫触");
}
} catch (Exception e) {
@@ -277,7 +291,9 @@
response,
success
);
- } catch (Exception e) { log.error("", e); }
+ } catch (Exception e) {
+ log.error("", e);
+ }
}
}
// 鍑哄簱瀹屾垚涓婃姤
@@ -292,7 +308,7 @@
}
pakoutParam.setOrderNo(order.getOrderNo());
for (OrderDetl orderDetl : orderDetls) {
- if (!orderDetl.getQty().equals(orderDetl.getAnfme())){
+ if (!orderDetl.getQty().equals(orderDetl.getAnfme())) {
settle = 99L;//浜屾鐢熸垚鍗曟嵁
}
String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
@@ -316,7 +332,7 @@
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
} else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKOUT_URL, JSON.toJSONString(pakoutParam), response);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.PAKOUT_URL, JSON.toJSONString(pakoutParam), response);
throw new CoolException("涓婃姤mes绯荤粺澶辫触");
}
} catch (Exception e) {
@@ -335,7 +351,9 @@
response,
success
);
- } catch (Exception e) { log.error("", e); }
+ } catch (Exception e) {
+ log.error("", e);
+ }
}
}
return SUCCESS;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 94f804b..024bac0 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -30,7 +30,7 @@
# global-config:
# field-strategy: 0
configuration:
- # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
map-underscore-to-camel-case: true
cache-enabled: true
call-setters-on-nulls: true
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 03e2acd..d033522 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -136,14 +136,14 @@
<!-- and (a.brand IS NULL OR a.brand = '')-->
<!-- </otherwise>-->
</choose>
- <choose>
- <when test="standby1 != null and standby1 != ''">
- and a.standby1 = #{standby1}
- </when>
- <otherwise>
- and (a.standby1 IS NULL OR a.standby1 = '')
- </otherwise>
- </choose>
+<!-- <choose>-->
+<!-- <when test="standby1 != null and standby1 != ''">-->
+<!-- and a.standby1 = #{standby1}-->
+<!-- </when>-->
+<!-- <otherwise>-->
+<!-- and (a.standby1 IS NULL OR a.standby1 = '')-->
+<!-- </otherwise>-->
+<!-- </choose>-->
<choose>
<when test="standby2 != null and standby2 != ''">
and a.standby2 = #{standby2}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index d9c3822..27e9574 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -559,18 +559,6 @@
$("#importExcel").trigger("click");
}
-// excel瀵煎叆妯℃澘涓嬭浇
-function excelMouldDownload() {
- layer.load(1, {shade: [0.1, '#fff']});
- location.href = baseUrl + "/mat/excel/import/mould";
- layer.closeAll('loading');
-}
-
-// excel瀵煎叆
-function importExcel() {
- $("#importExcel").trigger("click");
-}
-
function upload(obj) {
if (!obj.files) {
return;
--
Gitblit v1.9.1