From 7096b34d983aaf5c1a863a903a7ebd09a217f687 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 11 十月 2023 13:07:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 4 ++--
src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java | 7 +++++++
src/main/java/com/zy/asrs/entity/OrderDetl.java | 2 +-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 1 +
src/main/java/com/zy/asrs/entity/WrkDetl.java | 4 ++--
src/main/webapp/static/js/order/order.js | 6 +++++-
src/main/resources/application.yml | 2 +-
src/main/webapp/views/order/order.html | 3 +++
8 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 18b1894..f617ed9 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -377,7 +377,7 @@
if (null == this.source){ return "鏈‘璁�"; }
switch (this.source){
case 1:
- return "纭";
+ return "宸茬‘璁�";
default:
return "鏈‘璁�";
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 858ca9b..52e8220 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -307,7 +307,7 @@
if (null == this.source){ return "鏈‘璁�"; }
switch (this.source){
case 1:
- return "纭";
+ return "宸茬‘璁�";
default:
return "鏈‘璁�";
}
@@ -317,7 +317,7 @@
if (null == this.source){ return "鏈‘璁�"; }
switch (this.source){
case 1:
- return "纭";
+ return "宸茬‘璁�";
default:
return "鏈‘璁�";
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index dd5ee4c..ec65426 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -305,7 +305,7 @@
if (null == this.source){ return "鏈‘璁�"; }
switch (this.source){
case 1:
- return "纭";
+ return "宸茬‘璁�";
default:
return "鏈‘璁�";
}
@@ -315,7 +315,7 @@
if (null == this.source){ return "鏈‘璁�"; }
switch (this.source){
case 1:
- return "纭";
+ return "宸茬‘璁�";
default:
return "鏈‘璁�";
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index b06d755..57a83b6 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -779,6 +779,7 @@
wrkMast.setCrnEndTime(now);
wrkMast.setModiTime(now);
wrkMast.setModiUser(userId);
+ wrkMast.setSheetNo("2");
// 瀹屾垚鎿嶄綔浜哄憳璁板綍
wrkMast.setManuType("鎵嬪姩瀹屾垚");
if (!wrkMastService.updateById(wrkMast)) {
diff --git a/src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java b/src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java
index b7992c7..bba7f06 100644
--- a/src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java
+++ b/src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java
@@ -1,5 +1,6 @@
package com.zy.asrs.utils;
+import com.core.common.Cools;
import com.zy.asrs.entity.param.StockOutParam;
import java.util.ArrayList;
@@ -153,6 +154,9 @@
List<StockOutParam.LocDetl> locDetls = param.getLocDetls();
List<String> brands = new ArrayList<>();
for (StockOutParam.LocDetl locDetl:locDetls){
+ if (Cools.isEmpty(locDetl.getBrand())){
+ locDetl.setBrand("");
+ }
if (!brands.contains(locDetl.getBrand())){
brands.add(locDetl.getBrand());
}
@@ -166,6 +170,9 @@
List<StockOutParam.LocDetl> locDetls5 = new ArrayList<>();
List<StockOutParam.LocDetl> locDetls6 = new ArrayList<>();
for (StockOutParam.LocDetl locDetl:locDetls){
+ if (Cools.isEmpty(locDetl.getBrand())){
+ locDetl.setBrand("");
+ }
if (locDetl.getBrand().equals(brand)){
switch (Utils.getRow(locDetl.getLocNo())){
case 1: case 2: case 3: case 4:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d88b5cd..a2e3289 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=srjtasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=srjtasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 467301f..a6a59f1 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -48,7 +48,7 @@
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
- {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
+ {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 240}
]],
request: {
pageName: 'curr',
@@ -90,6 +90,10 @@
var layEvent = obj.event;
if (layEvent === 'edit') {
showEditModel(data);
+ } else if (layEvent === 'qweq213') {
+ layer.msg('鏈畬鎴�', {icon: 2});
+ } else if (layEvent === '123as') {
+ layer.msg('鏈畬鎴�', {icon: 2});
} else if (layEvent === 'wrkTrace') {
showWrkTrace(data.id);
} else if (layEvent === 'del') {
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index b5903d5..28796d7 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -99,10 +99,13 @@
{{# if (d.settle == 0 || d.settle == 1) { }}
<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
+ <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="qweq213">涓婁紶鏍囩</a>
{{# } }}
{{# if (d.settle == 2) { }}
+ <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="qweq213">涓婁紶鏍囩</a>
<a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
{{# } }}
+<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="123as">閫�搴撳崟</a>-->
</script>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="tbLook">
--
Gitblit v1.9.1