From 2ee6aabfa6a557939dfae393c4881b8b5b9ea270 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期日, 21 十二月 2025 09:54:01 +0800
Subject: [PATCH] 1
---
src/main/webapp/static/js/locDetl/locDetl.js | 2 +-
src/main/webapp/views/locDetl/locDetl.html | 2 +-
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2 +-
src/main/java/com/zy/asrs/controller/OpenController.java | 2 +-
src/main/resources/mapper/LocDetlMapper.xml | 2 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/entity/param/UnQualifiedOrderConfirmParam.java | 1 +
7 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 8a1f5b9..10d8f66 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -521,7 +521,7 @@
List<UnQualifiedOrderConfirmParam.VolumeNumber> volumeNumbers = param.getVolumeNumbers();
for (UnQualifiedOrderConfirmParam.VolumeNumber v :volumeNumbers){
if (!Cools.isEmpty(v.getVolumeNumber())&&!Cools.isEmpty(param.getQualified())){
- locDetlMapper.updateQualifiedByBrand(v.getVolumeNumber(), param.getQualified());
+ locDetlMapper.updateQualifiedByBrand(v.getVolumeNumber(), param.getQualified(),param.getRemark());
}
}
return R.ok(param);
diff --git a/src/main/java/com/zy/asrs/entity/param/UnQualifiedOrderConfirmParam.java b/src/main/java/com/zy/asrs/entity/param/UnQualifiedOrderConfirmParam.java
index 7063b9f..961b803 100644
--- a/src/main/java/com/zy/asrs/entity/param/UnQualifiedOrderConfirmParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/UnQualifiedOrderConfirmParam.java
@@ -9,6 +9,7 @@
private String orderNumber; //缁勮揣鍗曞彿
private List<VolumeNumber> volumeNumbers; // 澶氫釜鍖呰缁勫彿
private String qualified; // 1鍚堟牸2涓嶅悎鏍硷紝3涓嶅悎鏍煎崟鏀捐
+ private String remark; // 澶囨敞
private String memo;//澶囨敞
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index eae0a23..fba2a42 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -118,5 +118,5 @@
* @param brand 鍖呰缁勫彿
* @param qualified 鏍￠獙缁撴灉 鍚堟牸/涓嶅悎鏍�
*/
- void updateQualifiedByBrand(@Param("brand") String brand, @Param("qualified") String qualified);
+ void updateQualifiedByBrand(@Param("brand") String brand, @Param("qualified") String qualified,@Param("remark")String remark);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 8309015..bb296ff 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -2574,7 +2574,7 @@
List<UnQualifiedOrderConfirmParam.VolumeNumber> volumeNumbers = param.getVolumeNumbers();
for (UnQualifiedOrderConfirmParam.VolumeNumber v :volumeNumbers){
if (!Cools.isEmpty(v.getVolumeNumber())&&!Cools.isEmpty(param.getQualified())){
- locDetlMapper.updateQualifiedByBrand(v.getVolumeNumber(), param.getQualified());
+ locDetlMapper.updateQualifiedByBrand(v.getVolumeNumber(), param.getQualified(),param.getRemark());
}
}
return R.ok("缁勮揣纭鎴愬姛");
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 1cad7ac..6f81538 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -448,6 +448,6 @@
</update>
<update id="updateQualifiedByBrand">
- update asr_loc_detl set three_code = #{qualified} where brand = #{brand}
+ update asr_loc_detl set three_code = #{qualified} where brand = #{brand} and supp = #{supp}
</update>
</mapper>
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 9d58342..9ea2f3d 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -28,7 +28,6 @@
,{field: 'length', align: 'center',title: '闀垮害', hide: false}
,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'specs', align: 'center',title: '鎺ュご', hide:true}
- ,{field: 'suppCode', align: 'center',title: '鏂版棫', hide:true}
,{field: 'deadWarn$', align: 'center',title: '鐞嗚揣鐘舵��', hide: false}
@@ -41,6 +40,7 @@
return d.threeCode ? d.threeCode : '寰呭垽';
}
}
+ ,{field: 'supp', align: 'center',title: '澶囨敞'}
// ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
// ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
// ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 9e4bd3a..3e1ff93 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -126,7 +126,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/locDetl/locDetl.js?v=2" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/locDetl/locDetl.js?v=664" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
--
Gitblit v1.9.1