From 6aeb134430e16e0dde739da0274c1d60273f0f89 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 10 十月 2025 09:08:37 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 25 +++++++-----
north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryReport.vue | 6 +-
north-glass-erp/northglass-erp/src/views/sd/bom/ProductBOM.vue | 23 +++++++++--
north-glass-erp/src/main/java/com/example/erp/entity/sd/DeliveryDetail.java | 3 -
north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java | 6 +++
5 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/bom/ProductBOM.vue b/north-glass-erp/northglass-erp/src/views/sd/bom/ProductBOM.vue
index 779b406..515ff91 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/bom/ProductBOM.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/bom/ProductBOM.vue
@@ -28,9 +28,17 @@
productName:null//浜у搧鍚嶇О
})
let glassType = ref([])
+let sortData = ref({
+ field:'id',
+ order:null
+})
const getProduct = () => {
- request.post(`/product/1/100/${productGlassTypeStore.GlassType}`,filterData.value).then((res) => {
+ const config = {
+ filter: filterData.value,
+ sort: sortData.value
+ }
+ request.post(`/product/1/100/${productGlassTypeStore.GlassType}`,config).then((res) => {
if(res.code==200){
pageTotal.value=res.data.total
xGrid.value.loadData(res.data.data)
@@ -108,7 +116,11 @@
}
if(pageState!==null){
gridOptions.loading=true
- request.post(`/product/${pageNum}/100/${productGlassTypeStore.GlassType}`,filterData.value).then((res) => {
+ const config = {
+ filter: filterData.value,
+ sort: sortData.value
+ }
+ request.post(`/product/${pageNum}/100/${productGlassTypeStore.GlassType}`,config).then((res) => {
try{
if(res.code==200){
if(pageState){
@@ -138,9 +150,12 @@
})
-
+const config = {
+ filter: filterData.value,
+ sort: sortData.value
+}
//绗竴娆″姞杞芥暟鎹�
-request.post(`/product/1/100/${productGlassTypeStore.GlassType}`,filterData.value).then((res) => {
+request.post(`/product/1/100/${productGlassTypeStore.GlassType}`,config).then((res) => {
if(res.code==200){
pageTotal.value=res.data.total
produceList = produceList.value.concat(deepClone(res.data.data))
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryReport.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryReport.vue
index 8fd8954..4a6181e 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryReport.vue
@@ -16,9 +16,9 @@
{field: 'orderDetail.productName',width:120, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'delivery.paymentTerms',width:120, title: t('delivery.paymentTerms'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'delivery.project',width:140, title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'batch', width: 90, title: t('order.batch'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'width', width: 90, title: t('order.width'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'height', width: 90, title: t('order.height'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'order.batch', width: 90, title: t('order.batch'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'orderDetail.width', width: 90, title: t('order.width'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'orderDetail.height', width: 90, title: t('order.height'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'quantity',width:120, title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'price',width:120, title: t('order.price'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'area',width:120, title: t('productStock.totalArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java
index da879fb..1265cd6 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/sd/DeliveryDetailDTO.java
@@ -68,6 +68,12 @@
private String orderId;
@ExcelProperty("璁㈠崟搴忓彿")
private Integer orderNumber;
+ @ExcelProperty("鎵规")
+ private String batch;
+ @ExcelProperty("瀹�")
+ private Double width;
+ @ExcelProperty("楂�")
+ private Double height;
@ExcelProperty("澶囨敞")
private String deliveryDetailRemakes;
@ExcelProperty("鎶ヨ〃鏃ユ湡")
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/DeliveryDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/DeliveryDetail.java
index 462ed19..11b3022 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/DeliveryDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/DeliveryDetail.java
@@ -30,8 +30,5 @@
private Delivery delivery;
private OrderDetail orderDetail;
private Order order;
- private String batch;
- private Double width;
- private Double height;
}
diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
index ab21c0e..575b2ee 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -73,9 +73,7 @@
<result column="delivery_detail_remakes" property="deliveryDetailRemakes"/>
<result column="delivery_detail_state" property="deliveryDetailState"/>
<result column="create_time" property="createTime"/>
- <result column="batch" property="batch"/>
- <result column="width" property="width"/>
- <result column="height" property="height"/>
+
<result column="customer_id" property="delivery.customerId"/>
<result column="customer_name" property="delivery.customerName"/>
<result column="project" property="delivery.project"/>
@@ -94,9 +92,11 @@
<result column="product_id" property="orderDetail.productId"/>
<result column="product_name" property="orderDetail.productName"/>
+ <result column="width" property="orderDetail.width"/>
+ <result column="height" property="orderDetail.height"/>
<result column="other_money" property="order.otherMoney"/>
-
+ <result column="batch" property="order.batch"/>
</resultMap>
@@ -599,14 +599,14 @@
left join sd.`order` o on dd.order_id=o.order_id
<where>
and date(dd.create_time)>=#{startDate} and date(dd.create_time) <= #{endDate}
- <if test="deliveryDetail.batch != null and deliveryDetail.batch != ''">
- and o.batch like concat('%',#{deliveryDetail.batch},'%')
+ <if test="deliveryDetail.order!=null and (deliveryDetail.order.batch != null and deliveryDetail.order.batch != '')">
+ and o.batch like concat('%',#{deliveryDetail.order.batch},'%')
</if>
- <if test="deliveryDetail.width != null and deliveryDetail.width != ''">
- and od.width like concat('%',#{deliveryDetail.width},'%')
+ <if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.width != null and deliveryDetail.orderDetail.width != '')">
+ and od.width regexp REGEXP_REPLACE(#{deliveryDetail.orderDetail.width},'\\.0+$','')
</if>
- <if test="deliveryDetail.height != null and deliveryDetail.height != ''">
- and od.height like concat('%',#{deliveryDetail.height},'%')
+ <if test="deliveryDetail.orderDetail!=null and (deliveryDetail.orderDetail.height != null and deliveryDetail.orderDetail.height != '')">
+ and od.height regexp REGEXP_REPLACE(#{deliveryDetail.orderDetail.height},'\\.0+$','')
</if>
<if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
and dd.delivery_id like concat('%',#{deliveryDetail.deliveryId},'%')
@@ -1319,7 +1319,10 @@
o.other_money,
d.freight,
d.freight_price,
- d.freight_quantity
+ d.freight_quantity,
+ od.width,
+ od.height,
+ o.batch
from sd.delivery_detail dd
left join sd.delivery d on dd.delivery_id=d.delivery_id
left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
--
Gitblit v1.8.0