From 0aa1c9d1a42e2ac5639228d23dfedbc03ded6fb5 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期三, 30 三月 2022 16:28:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/webapp/static/js/chaoTime/chaoTime.js | 1 +
src/main/resources/mapper/ItemMapper.xml | 8 ++++++++
src/main/java/zy/cloud/wms/manager/mapper/ItemMapper.java | 2 ++
src/main/java/zy/cloud/wms/manager/service/ItemService.java | 4 ++++
src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java | 8 ++++++++
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 10 ++++++----
src/main/java/zy/cloud/wms/manager/entity/Item.java | 15 +++++++++++++--
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 11 +++++++++++
src/main/webapp/static/js/chaoPrice/chaoPrice.js | 1 +
9 files changed, 54 insertions(+), 6 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..5f3d349 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
@@ -158,6 +159,16 @@
item.setRealEndTime(newitem.getRealEndTime());
item.setRealStartTime(newitem.getRealStartTime());
}
+ //瓒呭嚭杩愯垂
+ if(item.getPlandeAmt()!=null && item.getRealdeAmt()!=null){
+ item.setExcessAmount(item.getRealdeAmt()-item.getPlandeAmt());
+ }
+ //瓒呭嚭澶╂暟
+ if(item.getRealinDate()!=null && item.getPlaninDate()!=null){
+ Double days = (double) ((item.getRealinDate().getTime() - item.getPlaninDate().getTime()) / (1000*3600*24));
+ Integer day= (int) Math.ceil(days);
+ item.setExcessTime(day);
+ }
item.setUpdateBy(getUserId());
item.setUpdateTime(new Date());
itemService.update(item,new EntityWrapper<Item>()
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
index 43e1eef..f292bf4 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -373,10 +373,12 @@
Wrapper<Item> wrapper = new EntityWrapper<>();
data.setTotalQuantity(itemService.selectCount(wrapper));//椤圭洰鎬诲叡鏁伴噺
data.setIntoSum(itemService.selectCount(wrapper.eq("type","10")));//闆嗘垚椤圭洰鏁�
- data.setWrongInto(itemService.selectCount(wrapper.ne("type","10")));//闈為泦鎴愰」鐩暟
- data.setInspected(itemService.selectCount(wrapper.eq("realLADate","").and().eq("realLADate",null)));//宸查獙鏀堕」鐩暟閲�
- data.setWrongInspected(itemService.selectCount(wrapper.ne("realLADate",null)));//鏈獙鏀堕」鐩暟閲�
- data.setFinished(itemService.selectCount(wrapper.ne("realinDate", null).eq("realLADate", null)));//宸插畬宸ユ湭楠屾敹鏁伴噺
+ data.setWrongInto(data.getTotalQuantity()-data.getIntoSum());//闈為泦鎴愰」鐩暟
+ List<Item> list = itemService.inspected();
+ data.setInspected(list.size());//宸查獙鏀堕」鐩暟閲�
+ data.setWrongInspected(data.getTotalQuantity()-data.getInspected());//鏈獙鏀堕」鐩暟閲�
+ List<Item> lists = itemService.finished();
+ data.setFinished(lists.size());//宸插畬宸ユ湭楠屾敹鏁伴噺
return R.ok().add(data);
}
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..035973d 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Item.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -22,8 +22,6 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.List;
-
@Data
@TableName("man_item")
public class Item implements Serializable {
@@ -368,6 +366,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/java/zy/cloud/wms/manager/mapper/ItemMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/ItemMapper.java
index dc4f0a1..6ba9449 100644
--- a/src/main/java/zy/cloud/wms/manager/mapper/ItemMapper.java
+++ b/src/main/java/zy/cloud/wms/manager/mapper/ItemMapper.java
@@ -16,4 +16,6 @@
public interface ItemMapper extends BaseMapper<Item> {
List<Item> chaoPrice(Map<String, Object> map,String uuid);
List<Item> chaoTime(Map<String, Object> map,String uuid);
+ List<Item> inspected();
+ List<Item> finished();
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/ItemService.java b/src/main/java/zy/cloud/wms/manager/service/ItemService.java
index d16a9f3..84f1e00 100644
--- a/src/main/java/zy/cloud/wms/manager/service/ItemService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/ItemService.java
@@ -15,4 +15,8 @@
Page<Item> chaoPirce(Page<Item> page,String uuid);
Page<Item> chaoTime(Page<Item> page,String uuid);
+
+ List<Item> inspected();
+
+ List<Item> finished();
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java
index 2244bce..e9a647a 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java
@@ -65,4 +65,12 @@
}
}
+ @Override
+ public List<Item> inspected(){
+ return baseMapper.inspected();
+ }
+ @Override
+ public List<Item> finished(){
+ return baseMapper.finished();
+ }
}
diff --git a/src/main/resources/mapper/ItemMapper.xml b/src/main/resources/mapper/ItemMapper.xml
index de06595..2d23645 100644
--- a/src/main/resources/mapper/ItemMapper.xml
+++ b/src/main/resources/mapper/ItemMapper.xml
@@ -55,6 +55,8 @@
<result column="planLADate" property="planLADate" />
<result column="realLADate" property="realLADate" />
<result column="planCarnumber" property="planCarnumber"/>
+ <result column="Excess_amount" property="excessAmount"/>
+ <result column="Excess_time" property="excessTime"/>
</resultMap>
<select id="chaoPrice" resultMap="BaseResultMap">
select * from man_item where 1=1 and realdeAmt>plandeAmt
@@ -79,4 +81,10 @@
and uuid=#{uuid}
</if>
</select>
+ <select id="inspected" resultMap="BaseResultMap">
+ select * from man_item where realLADate is not null
+ </select>
+ <select id="finished" resultMap="BaseResultMap">
+ select * from man_item where realLADate is null and realinDate is not null
+ </select>
</mapper>
diff --git a/src/main/webapp/static/js/chaoPrice/chaoPrice.js b/src/main/webapp/static/js/chaoPrice/chaoPrice.js
index c2ea4b4..438e5ca 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..9a5b02d 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