From 1a432aec361a177fc309c33d6c2962fa58ad8b09 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 17 十月 2022 14:44:29 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderDetlMapper.xml | 16 ++++++++
src/main/java/com/zy/asrs/controller/OrderController.java | 81 +++++++++++++++++++++++++++++++++++++++-
src/main/java/com/zy/asrs/service/OrderDetlService.java | 2 +
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 2 +
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 5 ++
src/main/webapp/static/js/order/order.js | 5 +-
src/main/resources/application.yml | 4 +-
7 files changed, 109 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 38170b6..9cf0b36 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -50,6 +50,8 @@
private WrkMastLogService wrkMastLogService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private MatService matService;
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -446,15 +448,90 @@
// 鏁伴噺
Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(3)));
// 涓嬪崟鏃堕棿
- Date time = DateUtils.convert(dataFormatter.formatCellValue(row.getCell(4)), DateUtils.yyyyMMddHHmmsssss_F);
+ String timeStr = dataFormatter.formatCellValue(row.getCell(4));
+ Date time = null;
+ try {
+ time = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss_F);
+ } catch (Exception e) {
+ throw new CoolException("绗�" + i + "琛屼笅鐨勯偅鏃堕棿瑙ｆ瀽澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ }
// 鍟嗗搧绯诲垪
String tagName = dataFormatter.formatCellValue(row.getCell(5));
// 瑙勬牸
String specs = dataFormatter.formatCellValue(row.getCell(6));
+ Mat mat = matService.selectByMatnr(matnr);
+ if (null == mat) {
+ throw new CoolException(matnr + "鍟嗗搧缂栫爜鐨勫晢鍝佷笉瀛樺湪锛岃閲嶆柊瀵煎叆锛�");
+ }
+ Order order = orderService.selectByNo(uuid);
+ if (null == order) {
+ order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ uuid, // 璁㈠崟缂栧彿
+ timeStr, // 鍗曟嵁鏃ユ湡
+ 14L, // 鍗曟嵁绫诲瀷
+ null, // 椤圭洰缂栧彿
+ null, //
+ null, // 璋冩嫧椤圭洰缂栧彿
+ null, // 鍒濆绁ㄦ嵁鍙�
+ null, // 绁ㄦ嵁鍙�
+ null, // 瀹㈡埛缂栧彿
+ null, // 瀹㈡埛
+ null, // 鑱旂郴鏂瑰紡
+ null, // 鎿嶄綔浜哄憳
+ null, // 鍚堣閲戦
+ null, // 浼樻儬鐜�
+ null, // 浼樻儬閲戦
+ null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, // 瀹炰粯閲戦
+ null, // 浠樻绫诲瀷
+ null, // 涓氬姟鍛�
+ null, // 缁撶畻澶╂暟
+ null, // 閭垂鏀粯绫诲瀷
+ null, // 閭垂
+ null, // 浠樻鏃堕棿
+ null, // 鍙戣揣鏃堕棿
+ null, // 鐗╂祦鍚嶇О
+ null, // 鐗╂祦鍗曞彿
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ 9527L, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ 9527L, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ if (!orderService.insert(order)) {
+ throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ }
+ }
+
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), matnr, null);
+ if (orderDetl == null) {
+ orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setBatch(null);
+ orderDetl.setAnfme(anfme);
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ }
+ } else {
+ if(!orderDetlService.increaseAnfme(order.getId(), matnr, null, anfme)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ }
+ }
}
- return R.ok();
+ return R.ok("瀵煎叆鎴愬姛");
}
}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index 0c3a911..f55c61a 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -23,6 +23,8 @@
Integer getPakoutPageCount(Map<String, Object> map);
+ int increaseAnfme(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+
int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index 6178f0b..20cf173 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -18,6 +18,8 @@
OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch);
+ boolean increaseAnfme(Long orderId, String matnr, String batch, Double qty);
+
boolean increase(Long orderId, String matnr, String batch, Double qty);
boolean decrease(String orderNo, String matnr, String batch, Double qty);
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index 6b89902..f069bb5 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -49,6 +49,11 @@
}
@Override
+ public boolean increaseAnfme(Long orderId, String matnr, String batch, Double qty) {
+ return this.baseMapper.increaseAnfme(orderId, matnr, batch, qty) > 0;
+ }
+
+ @Override
public boolean increase(Long orderId, String matnr, String batch, Double qty) {
return this.baseMapper.increase(orderId, matnr, batch, qty) > 0;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 82ee6e0..c2987e9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,8 +10,8 @@
enabled: false
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://10.10.10.100:1433;databasename=bfasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=bfasrs
username: sa
# password: Zoneyung@zy56$
password: sa@123
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 4fe7eea..ed77f18 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -126,6 +126,22 @@
<include refid="pakOutPageCondition"></include>
</select>
+ <update id="increaseAnfme">
+ update man_order_detl
+ set anfme = anfme + #{qty}
+ where 1=1
+ and order_id = #{orderId}
+ and matnr = #{matnr}
+ <choose>
+ <when test="batch != null and batch != ''">
+ and batch = #{batch}
+ </when>
+ <otherwise>
+ and (batch IS NULL OR batch = '')
+ </otherwise>
+ </choose>
+ </update>
+
<update id="increase">
update man_order_detl
set qty = qty + #{qty}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index bf48418..3ef4275 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -1,5 +1,6 @@
var insTbCount = 0;
var admin;
+var insTb
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).use(['layer', 'form', 'table', 'util', 'admin', 'xmSelect', 'laydate'], function () {
@@ -35,7 +36,7 @@
})
// 娓叉煋琛ㄦ牸
- var insTb = table.render({
+ insTb = table.render({
elem: '#order',
url: baseUrl+'/order/head/page/auth',
headers: {token: localStorage.getItem('token')},
@@ -565,7 +566,7 @@
let res = JSON.parse(evt.target.responseText);
if(res.code === 200) {
layer.msg(res.msg, {icon: 1});
- tableReload();
+ insTb.reload({page: {curr: 1}});
} else {
alert(res.msg);
// layer.msg(res.msg, {icon: 2});
--
Gitblit v1.9.1