From 4a2c6796c89f6889bbdd3e9630fee40a93c6473e Mon Sep 17 00:00:00 2001
From: admin <418351270@qq.com>
Date: 星期四, 11 一月 2024 08:53:44 +0800
Subject: [PATCH] 添加查询
---
guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/mapper/mapping/ProductionOrderBatchInfoMapper.xml | 6 ++++++
guns-vip-main/src/main/webapp/assets/modular/om/productionOrderBatchInfo/productionOrderBatchInfo.js | 2 +-
guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/service/impl/ProductionOrderBatchInfoServiceImpl.java | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/mapper/mapping/ProductionOrderBatchInfoMapper.xml b/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/mapper/mapping/ProductionOrderBatchInfoMapper.xml
index 494c5a3..88f6275 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/mapper/mapping/ProductionOrderBatchInfoMapper.xml
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/mapper/mapping/ProductionOrderBatchInfoMapper.xml
@@ -33,6 +33,12 @@
select
<include refid="Base_Column_List"/>
from om_production_order_batch_info where 1 = 1
+ <if test="paramCondition.workOrderNo != null and paramCondition.workOrderNo != ''">
+ and work_order_no like CONCAT('%',#{paramCondition.workOrderNo},'%')
+ </if>
+ <if test="paramCondition.locationCode != null and paramCondition.locationCode != ''">
+ and location_code = #{paramCondition.locationCode}
+ </if>
</select>
<select id="customMapList" resultType="map" parameterType="cn.stylefeng.guns.modular.om.productionOrderBatchInfo.model.params.ProductionOrderBatchInfoParam">
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/service/impl/ProductionOrderBatchInfoServiceImpl.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/service/impl/ProductionOrderBatchInfoServiceImpl.java
index 1f4c72c..2d5d234 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/service/impl/ProductionOrderBatchInfoServiceImpl.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/service/impl/ProductionOrderBatchInfoServiceImpl.java
@@ -63,7 +63,7 @@
@Override
public List<ProductionOrderBatchInfoResult> findListBySpec(ProductionOrderBatchInfoParam param){
- return null;
+ return this.baseMapper.customList(param);
}
@Override
diff --git a/guns-vip-main/src/main/webapp/assets/modular/om/productionOrderBatchInfo/productionOrderBatchInfo.js b/guns-vip-main/src/main/webapp/assets/modular/om/productionOrderBatchInfo/productionOrderBatchInfo.js
index d469ecd..b9a2212 100644
--- a/guns-vip-main/src/main/webapp/assets/modular/om/productionOrderBatchInfo/productionOrderBatchInfo.js
+++ b/guns-vip-main/src/main/webapp/assets/modular/om/productionOrderBatchInfo/productionOrderBatchInfo.js
@@ -26,7 +26,7 @@
{field: 'materialCode', sort: true, title: '鐗╂枡缂栫爜'},
{field: 'loadingCode', sort: true, title: '鐗╂枡鎵规'},
{field: 'spareField1', sort: true, title: '涓婃枡鏁伴噺'},
- {field: 'spareField3', sort: true, title: '鍓╀綑鏁伴噺'},
+ {field: 'productionLine', sort: true, title: '鍓╀綑鏁伴噺'},
{field: 'spareField2', sort: true, title: '鍗曚綅'},
{field: 'state', sort: true, title: '鏄惁涓婃枡', width: 105,templet: '#stateTpl'},
--
Gitblit v1.9.3