From cc3185eaf94050d299cbd9d0c105eb3d1229996a Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期四, 24 十月 2024 16:10:04 +0800
Subject: [PATCH] 修復
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlMapper.java | 2 ++
zy-asrs-common/src/main/resources/mapper/wms/OrderDetlMapper.xml | 7 +++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/UserController.java | 6 ++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java | 4 ++--
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java | 1 +
zy-asrs-wms/src/main/webapp/static/js/orderTable.js | 2 +-
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java | 29 ++---------------------------
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java | 2 +-
8 files changed, 22 insertions(+), 31 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/UserController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/UserController.java
index 3d049f6..5a976e3 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/UserController.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/UserController.java
@@ -111,6 +111,12 @@
if (user.getMobile()!=null) {
entity.setMobile(user.getMobile());
}
+ if (user.getRoleId()!=null) {
+ entity.setRoleId(user.getRoleId());
+ }
+ if (user.getSex()!=null) {
+ entity.setSex(user.getSex());
+ }
userService.updateById(entity);
return R.ok();
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlMapper.java
index 3a80cee..fc1e0f7 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlMapper.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlMapper.java
@@ -17,6 +17,8 @@
List<OrderDetl> selectWorkingDetls(Long orderId);
+ List<OrderDetl> selectDetls(Long orderId,Long hostId);
+
OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("hostId") Long hostId);
OrderDetl selectItem2(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("hostId") Long hostId);
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
index e44cfac..3a9d595 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
@@ -124,7 +124,7 @@
if (order.getSettle() >= 4L) {
return;
}
- List<OrderDetl> orderDetls = orderDetlMapper.selectList(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()).eq(OrderDetl::getHostId, hostId));
+ List<OrderDetl> orderDetls = orderDetlMapper.selectDetls(order.getId(),hostId);
boolean complete = true;
for (OrderDetl orderDetl : orderDetls) {
if (orderDetl.getAnfme() > orderDetl.getQty()) {
@@ -132,32 +132,7 @@
break;
}
}
- if (complete && wrkDetlService.count(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getOrderNo, orderNo).eq(WrkDetl::getHostId, hostId)) == 0) {
- // 鍑哄簱璁㈠崟閲嶆柊鏁寸悊鏄庣粏
- DocType docType = docTypeService.getById(order.getDocType());
- if (null != docType && docType.getPakout() == 1) {
- List<OrderDetl> orderDetlList = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()).eq(OrderDetl::getHostId, hostId));
-// if (!orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()).eq(OrderDetl::getHostId, hostId))) {
-// throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
-// }
-// List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo, hostId);
- for (OrderDetl orderDetl : orderDetlList) {
-// OrderDetl orderDetl = new OrderDetl();
-// orderDetl.sync(orderDetl1);
- orderDetl.setQty(orderDetl.getAnfme());
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(orderNo);
- orderDetl.setStatus(1);
-// orderDetl.setCreateTime(order.getCreateTime());
-// orderDetl.setCreateBy(order.getCreateBy());
- orderDetl.setUpdateTime(order.getUpdateTime());
- orderDetl.setUpdateBy(order.getUpdateBy());
- if (!orderDetlService.updateById(orderDetl)) {
- throw new CoolException("閲嶆暣鍑哄簱璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戞槑缁嗗け璐�");
- }
- }
- }
-
+ if (complete) {
if (!this.updateSettle(order.getId(), 4L, null, hostId)) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/OrderDetlMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/OrderDetlMapper.xml
index 219b7a5..35f7e18 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/OrderDetlMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/OrderDetlMapper.xml
@@ -24,6 +24,13 @@
and qty < anfme
</select>
+ <select id="selectDetls" resultType="com.zy.asrs.common.wms.entity.OrderDetl">
+ select * from wms_order_detl
+ where 1=1
+ and order_id = #{orderId}
+ and host_id = #{hostId}
+ </select>
+
<select id="selectItem" resultType="com.zy.asrs.common.wms.entity.OrderDetl">
select * from wms_order_detl
where 1=1
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
index ab9d627..1251aed 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
@@ -398,7 +398,7 @@
@RequestMapping("/pick/mat/list")
@ManagerAuth(memo = "鑾峰彇骞舵澘鐗╂枡")
public R pickMats(@RequestParam(required = false) String matnr){
- List<DocType> docTypes = docTypeService.list(new LambdaQueryWrapper<DocType>().like(DocType::getDocName, "鍏ュ簱"));
+ List<DocType> docTypes = docTypeService.list(new LambdaQueryWrapper<DocType>().like(DocType::getPakin, 1));
ArrayList<Long> typeList = new ArrayList<>();
for (DocType docType : docTypes) {
typeList.add(docType.getDocId());
@@ -440,7 +440,7 @@
matParam.setOrderNo(orderDetl.getOrderNo());
matParam.setOrderId(orderDetl.getOrderId());
matParam.setCount(count);
- matParam.setUseCount(0D);
+ matParam.setUseCount(count);
maps.add(matParam);
}
return R.ok().add(maps);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
index f8a9f3a..3b12b4c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
@@ -50,6 +50,7 @@
.or().like("sta_no", condition)
.or().like("source_sta_no", condition)
.or().like("loc_no", condition)
+ .or().like("barcode",condition)
.or().like("source_loc_no", condition);
});
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java
index 16bbf4c..c4a09df 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java
@@ -79,7 +79,7 @@
log.error("", e); }
}
}
- if (!success){
+ if (success){
return FAIL.setMsg("涓婂牨澶辨晽");
}
return SUCCESS;
diff --git a/zy-asrs-wms/src/main/webapp/static/js/orderTable.js b/zy-asrs-wms/src/main/webapp/static/js/orderTable.js
index fe183ab..6a77968 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/orderTable.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/orderTable.js
@@ -40,7 +40,7 @@
defaultToolbar: [],
cols: [[
// {type: 'numbers', title: '#'},
- {field: 'orderTime', title: '鏃ユ湡', width: 160},
+ {field: 'orderTime', title: '鏃ユ湡', width: 120},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', align: 'center', width: 155},
{field: 'docType$', title: '鍗曟嵁绫诲瀷', align: 'center'}
]],
--
Gitblit v1.9.1