From fc51b172429f629eb37acc3f1d7af666ba6ee7f5 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期三, 26 十月 2022 10:37:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 1 +
src/main/java/com/zy/asrs/entity/dto/OrderDetlWithSum.java | 13 +++++++++++++
src/main/java/com/zy/asrs/service/LocDetlService.java | 1 +
src/main/resources/mapper/LocDetlMapper.xml | 3 +++
src/main/webapp/static/js/order/order.js | 1 +
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 16 ++++++++++++++++
src/main/java/com/zy/asrs/controller/MatController.java | 11 ++++++++---
src/main/resources/application.yml | 3 ++-
8 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 66fabfa..602908e 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -12,8 +12,9 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatPrint;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.dto.OrderDetlWithSum;
import com.zy.asrs.entity.result.KeyValueVo;
+import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
import com.zy.common.CodeRes;
@@ -41,6 +42,9 @@
private MatService matService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+
+ @Autowired
+ private LocDetlService locDetlService;
@RequestMapping(value = "/mat/auto/matnr/auth")
public R autoMatnr(){
@@ -215,9 +219,10 @@
if (mat == null) {
return R.ok();
}
- OrderDetl orderDetl = new OrderDetl();
+ OrderDetlWithSum orderDetl = new OrderDetlWithSum();
orderDetl.sync(mat);
orderDetl.setAnfme(0.0D);
+ orderDetl.setSum(locDetlService.selectSumByMatnr(mat.getMatnr()));
return R.ok().add(orderDetl);
}
@@ -305,7 +310,7 @@
@ManagerAuth
public R getMatDataKV(@RequestParam(required = false) String condition) {
Wrapper<Mat> wrapper = new EntityWrapper<Mat>()
- .andNew().like("matnr", condition).or().like("maktx", condition)
+ .andNew().like("matnr", condition).or().like("maktx", condition).or().like("specs", condition)
.orderBy("create_time", false);
List<Mat> mats = matService.selectPage(new Page<>(1, 30), wrapper).getRecords();
List<KeyValueVo> valueVos = new ArrayList<>();
diff --git a/src/main/java/com/zy/asrs/entity/dto/OrderDetlWithSum.java b/src/main/java/com/zy/asrs/entity/dto/OrderDetlWithSum.java
new file mode 100644
index 0000000..e21b473
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/dto/OrderDetlWithSum.java
@@ -0,0 +1,13 @@
+package com.zy.asrs.entity.dto;
+
+
+import com.zy.asrs.entity.OrderDetl;
+import lombok.Data;
+
+/**
+ * 鍖呭惈搴撳瓨鎬绘暟閲�
+ */
+@Data
+public class OrderDetlWithSum extends OrderDetl {
+ private Double sum;
+}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index a0e6b4a..2037ce9 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -65,4 +65,5 @@
List<LocDetl> unreason();
+ Double selectSumByMatnr(@Param("matnr") String matnr);
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index e80ba27..2e25e26 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -58,4 +58,5 @@
List<LocDetl> unreason();
+ Double selectSumByMatnr(String matnr);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 213eaad..5092c63 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -111,6 +111,22 @@
return this.baseMapper.unreason();
}
+ /**
+ * 閫氳繃鐗╂枡浠ｇ爜鑾峰彇搴撳瓨鎬绘暟閲�
+ * @param matnr
+ * @return
+ */
+ @Override
+ public Double selectSumByMatnr(String matnr) {
+ Double aDouble = this.baseMapper.selectSumByMatnr(matnr);
+ if (aDouble == null) {
+ return 0.0;
+ }else {
+ return aDouble;
+
+ }
+ }
+
@Override
public LocDetl selectItem(String locNo, String matnr, String batch) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c2987e9..5114c81 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,7 +11,8 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
- url: jdbc:sqlserver://localhost:1433;databasename=bfasrs
+# url: jdbc:sqlserver://localhost:1433;databasename=bfasrs
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
username: sa
# password: Zoneyung@zy56$
password: sa@123
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 80a4ad9..38deb20 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -387,5 +387,8 @@
AND dual.count = 1
ORDER BY lm.modi_time ASC
</select>
+ <select id="selectSumByMatnr" resultType="java.lang.Double">
+ select sum(anfme) FROM asr_loc_detl WHERE matnr = #{matnr}
+ </select>
</mapper>
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 3ef4275..27e4712 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -241,6 +241,7 @@
{field: 'batch', title: '搴忓垪鐮�', edit: true},
{field: 'specs', title: '瑙勬牸'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+ {field: 'sum', title: '搴撳瓨鏁伴噺', style: 'color: red;font-weight: bold', minWidth: 110, width: 110},
// {field: 'inQty', title: '宸插叆搴撻噺', minWidth: 100, width: 100},
// {field: 'unit', title: '鍗曚綅', width: 80},
{field: 'memo', title: '澶囨敞' , edit: true},
--
Gitblit v1.9.1