From c2f77cb1c01b8215fd2fc8c76fd4180629b7f08f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 12 九月 2022 14:47:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/webapp/views/item/item.html | 24 +++++++++++++-----------
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 9 ++++++---
src/main/resources/application.yml | 4 ++--
3 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
index b654267..d8f827a 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -19,6 +19,7 @@
import zy.cloud.wms.manager.service.*;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
import java.util.*;
@RestController
@@ -129,9 +130,9 @@
if (!Cools.isEmpty(name)) {
throw new CoolException("涓嶅彲鏈夐噸澶嶉」鐩悕");
}
- if (item.getRealMonth() < 0){
- throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
- }
+// if (item.getRealMonth() < 0){
+// throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
+// }
if (Cools.isEmpty(item.getCstmrUuid())) {
throw new CoolException("璇烽�夋嫨瀹㈡埛");
}
@@ -153,6 +154,8 @@
item.setStatus(1);
item.setUpdateBy(getUserId());
item.setUpdateTime(new Date());
+ Long span = (item.getEndTime().getTime() - item.getStartTime().getTime()) / 1000 / 60 / 60 / 24;
+ item.setRealMonth(Math.toIntExact(span));
itemService.insertAll(item);
return R.ok();
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c0fc9ae..cd8fa0b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,9 +10,9 @@
# sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
#姝ｅ紡鏁版嵁搴�
-# url: jdbc:sqlserver://192.168.4.15:1433;databasename=zypms_pro
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=zypms_pro
#澶囦唤鏁版嵁搴�
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=zypms
+# url: jdbc:sqlserver://192.168.4.15:1433;databasename=zypms
username: sa
password: sa@123
mvc:
diff --git a/src/main/webapp/views/item/item.html b/src/main/webapp/views/item/item.html
index 0b10f63..ee98510 100644
--- a/src/main/webapp/views/item/item.html
+++ b/src/main/webapp/views/item/item.html
@@ -186,15 +186,22 @@
<input class="layui-input" name="dutyMan" id="dutyMan$" placeholder="璇疯緭鍏ヨ矗浠讳汉">
</div>
</div>
+
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">瀹炴柦鍛ㄦ湡(澶�): </label>
+ <label class="layui-form-label">澶囨敞: </label>
<div class="layui-input-block">
- <input class="layui-input" name="realMonth" id="realMonth$" placeholder="濉啓鏁板瓧澶╂暟" type="number" lay-verify="required"
- onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
- onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
- oninput="if(value>200)value=200;if(value<=0)value=1">
+ <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
</div>
</div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">瀹炴柦鍛ㄦ湡(澶�): </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="realMonth" id="realMonth$" placeholder="濉啓鏁板瓧澶╂暟" type="number" lay-verify="required"-->
+<!-- onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"-->
+<!-- onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"-->
+<!-- oninput="if(value>200)value=200;if(value<=0)value=1">-->
+<!-- </div>-->
+<!-- </div>-->
</div>
<div class="layui-col-md6">
@@ -299,12 +306,7 @@
<!-- <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">-->
<!-- </div>-->
<!-- </div>-->
- <div class="layui-form-item">
- <label class="layui-form-label">澶囨敞: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
- </div>
- </div>
+
</div>
</div>
<hr class="layui-bg-gray">
--
Gitblit v1.9.1