From 4d0a406c204d3a9c590fc713a6dc2fce60b9d012 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 05 八月 2025 21:25:47 +0800
Subject: [PATCH] 库单上要显示工作口， 需要已组好的排在后面，未组的排前面
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java | 3 +++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/OrderMapper.java | 2 +-
zy-asrs-admin/src/components/orderDetl/show.vue | 9 +++++++--
zy-asrs-wms/src/main/resources/mapper/asrs/OrderMapper.xml | 5 +++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java | 4 +++-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderService.java | 2 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java | 15 +++++++++++++--
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java | 14 ++++++++++----
8 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/zy-asrs-admin/src/components/orderDetl/show.vue b/zy-asrs-admin/src/components/orderDetl/show.vue
index 6855793..f9153ba 100644
--- a/zy-asrs-admin/src/components/orderDetl/show.vue
+++ b/zy-asrs-admin/src/components/orderDetl/show.vue
@@ -182,7 +182,7 @@
get("/api/order/" + newVal, {}).then((resp) => {
let result = resp.data;
- if(result.data != null) {
+ if (result.data != null) {
orderInfo.value = result.data;
console.log(result.data);
}
@@ -249,7 +249,7 @@
蹇�掑崟鍙凤細{{ orderInfo.logistics }}
</h3>
</div>
- <div>
+ <div>
<h3>
鏀惰揣鍦板潃锛歿{ orderInfo.address }}
</h3>
@@ -257,6 +257,11 @@
鑱旂郴鐢佃瘽锛歿{ orderInfo.phone }}
</h3>
</div>
+ <div>
+ <h2>
+ 鍑虹珯鍙ｏ細{{ orderInfo.site }}
+ </h2>
+ </div>
<div class="qrcode">
<a-qrcode :value="orderInfo.orderNo" :size="100" :bordered="false" />
</div>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
index bfa9762..9210137 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
@@ -81,7 +81,9 @@
return R.error("璁㈠崟涓嶅瓨鍦紒");
}
- List<OrderInfoDto> orders = orderService.getDetlForOrderId(order.getId());
+
+
+ List<OrderInfoDto> orders = orderService.getDetlForOrderId(order.getId() , barcode.get("matnr"));
return R.ok(orders);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
index acab6ee..6641e2f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
@@ -6,13 +6,12 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
-import com.zy.asrs.wms.asrs.entity.MatField;
-import com.zy.asrs.wms.asrs.entity.OrderDetl;
-import com.zy.asrs.wms.asrs.entity.OrderType;
+import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.enums.OrderSettleType;
import com.zy.asrs.wms.asrs.entity.param.CreateOrderParam;
import com.zy.asrs.wms.asrs.entity.param.UpdateOrderParam;
import com.zy.asrs.wms.asrs.entity.template.OrderTemplate;
+import com.zy.asrs.wms.asrs.service.CacheSiteService;
import com.zy.asrs.wms.asrs.service.MatFieldService;
import com.zy.asrs.wms.asrs.service.OrderTypeService;
import com.zy.asrs.wms.asrs.service.impl.OrderDetlServiceImpl;
@@ -21,7 +20,6 @@
import com.zy.asrs.wms.common.domain.BaseParam;
import com.zy.asrs.wms.common.domain.KeyValVo;
import com.zy.asrs.wms.common.domain.PageParam;
-import com.zy.asrs.wms.asrs.entity.Order;
import com.zy.asrs.wms.asrs.service.OrderService;
import com.zy.asrs.wms.system.controller.BaseController;
import com.zy.asrs.wms.utils.ExcelUtil;
@@ -47,6 +45,8 @@
private MatFieldService matFieldService;
@Autowired
private OrderDetlServiceImpl orderDetlService;
+ @Autowired
+ private CacheSiteService cacheSiteService;
@PreAuthorize("hasAuthority('asrs:order:list')")
@PostMapping("/order/page")
@@ -157,6 +157,12 @@
Double sum = detls.stream().mapToDouble(OrderDetl::getAnfme).sum();
order.setWaitQty(sum);
}
+
+ CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>()
+ .eq(CacheSite::getOrderId, order.getId()), false);
+ if (!Objects.isNull(cacheSite)) {
+ order.setSite(cacheSite.getChannel());
+ }
return R.ok().add(order);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java
index d8c68e7..910c32a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java
@@ -169,6 +169,9 @@
@TableField(exist = false)
private String orderStatus;
+ @TableField(exist = false)
+ private String site;
+
/**
* 璁㈠崟鐘舵��
* 1. 宸插畬鎴�
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/OrderMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/OrderMapper.java
index 6907fa4..32e9915 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/OrderMapper.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/OrderMapper.java
@@ -13,5 +13,5 @@
@Repository
public interface OrderMapper extends BaseMapper<Order> {
- List<OrderInfoDto> getDetlForOrderId(@Param("orderId") Long orderId);
+ List<OrderInfoDto> getDetlForOrderId(@Param("orderId") Long orderId, @Param("matId") Long matId);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderService.java
index 0bac41c..d64f34e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/OrderService.java
@@ -22,5 +22,5 @@
Order selectByBarcode(String barcode);
- List<OrderInfoDto> getDetlForOrderId(Long id);
+ List<OrderInfoDto> getDetlForOrderId(Long id, String matnr);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
index 240c693..e22e623 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.wms.asrs.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
@@ -304,7 +305,17 @@
}
@Override
- public List<OrderInfoDto> getDetlForOrderId(Long id) {
- return this.baseMapper.getDetlForOrderId(id);
+ public List<OrderInfoDto> getDetlForOrderId(Long id, String matnr) {
+ if (!Objects.isNull(matnr)) {
+ Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>()
+ .eq(StringUtils.isNotBlank(matnr), Mat::getMatnr, matnr), false);
+ if (Objects.isNull(mat)) {
+ return this.baseMapper.getDetlForOrderId(id, null);
+ } else {
+ return this.baseMapper.getDetlForOrderId(id, mat.getId());
+ }
+ } else {
+ return this.baseMapper.getDetlForOrderId(id, null);
+ }
}
}
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/OrderMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/OrderMapper.xml
index 2add054..a8688c6 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/OrderMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/OrderMapper.xml
@@ -24,5 +24,10 @@
<if test="orderId != null">
AND odl.order_id = #{orderId}
</if>
+ <if test="matId != null">
+ AND odl.mat_id = #{matId}
+ </if>
+ ORDER BY
+ work_qty ASC
</select>
</mapper>
--
Gitblit v1.9.1