From 8e9dd1cfcbf994850268c3b575ff3c7105d66e9d Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期一, 28 三月 2022 10:25:08 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/chaoTime/chaoTime.js | 1 +
src/main/java/zy/cloud/wms/manager/entity/Item.java | 13 +++++++++++++
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 9 +++++++++
src/main/webapp/static/js/chaoPrice/chaoPrice.js | 1 +
4 files changed, 24 insertions(+), 0 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 95fcd03..e783404 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -24,6 +24,7 @@
import zy.cloud.wms.manager.service.ProjectPlanService;
import zy.cloud.wms.manager.service.ProjectTypeService;
+import java.text.SimpleDateFormat;
import java.util.*;
@RestController
@@ -132,6 +133,14 @@
item.setStatus(1);
item.setUpdateBy(getUserId());
item.setUpdateTime(new Date());
+ if(item.getPlandeAmt()!=null && item.getRealdeAmt()!=null){
+ item.setExcessAmount(item.getRealdeAmt()-item.getPlandeAmt());
+ }
+ if(item.getPlandeDate()!=null && item.getRealinDate()!=null){
+ Integer days = (int) ((item.getRealinDate().getTime() - item.getPlandeDate().getTime()) / (1000*3600*24));
+ item.setExcessTime(days);
+ }
+
itemService.insertAll(item);
return R.ok();
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Item.java b/src/main/java/zy/cloud/wms/manager/entity/Item.java
index 6874241..ed8fbe8 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Item.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -368,6 +368,19 @@
@TableField("planCarnumber")
private Integer planCarnumber;
+ /**
+ * 棰勮杞﹁締鏁伴噺
+ */
+ @ApiModelProperty(value= "瓒呭嚭閲戦")
+ @TableField("Excess_amount")
+ private Double ExcessAmount;
+
+ /**
+ * 棰勮杞﹁締鏁伴噺
+ */
+ @ApiModelProperty(value= "瓒呭嚭澶╂暟")
+ @TableField("Excess_time")
+ private Integer ExcessTime;
public Item() {}
diff --git a/src/main/webapp/static/js/chaoPrice/chaoPrice.js b/src/main/webapp/static/js/chaoPrice/chaoPrice.js
index c2ea4b4..fb4b038 100644
--- a/src/main/webapp/static/js/chaoPrice/chaoPrice.js
+++ b/src/main/webapp/static/js/chaoPrice/chaoPrice.js
@@ -30,6 +30,7 @@
,{field: 'cstmrUuid$', align: 'center',title: '瀹㈡埛鍚嶇О'}
,{field: 'plandeAmt', align: 'center',title: '棰勮杩愯垂'}
,{field: 'realdeAmt', align: 'center',title: '瀹為檯杩愯垂'}
+ ,{field: 'ExcessAmount', align: 'center',title: '瓒呭嚭杩愯垂'}
,{field: 'dutyMan', align: 'center', title: '璐ｄ换浜�'}
,{field: 'dutyDepartment', align: 'center', title: '璐ｄ换閮ㄩ棬'}
,{field: 'status$', align: 'center',title: '鐘舵��'}
diff --git a/src/main/webapp/static/js/chaoTime/chaoTime.js b/src/main/webapp/static/js/chaoTime/chaoTime.js
index 341ea33..03fb3fb 100644
--- a/src/main/webapp/static/js/chaoTime/chaoTime.js
+++ b/src/main/webapp/static/js/chaoTime/chaoTime.js
@@ -30,6 +30,7 @@
,{field: 'cstmrUuid$', align: 'center',title: '瀹㈡埛鍚嶇О'}
,{field: 'planinDate$', align: 'center',title: '棰勮瀹夎鏃ユ湡'}
,{field: 'realinDate$', align: 'center',title: '瀹為檯瀹夎鏃ユ湡'}
+ ,{field: 'ExcessTime', align: 'center',title: '瓒呭嚭澶╂暟'}
,{field: 'dutyMan', align: 'center', title: '璐ｄ换浜�'}
,{field: 'dutyDepartment', align: 'center', title: '璐ｄ换閮ㄩ棬'}
,{field: 'status$', align: 'center',title: '鐘舵��'}
--
Gitblit v1.9.1