From 14d82196f6be4297ab4bed18840ded9848b359ef Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期四, 24 三月 2022 16:01:54 +0800
Subject: [PATCH] #
---
src/main/webapp/views/item/item.html | 4 +-
src/main/java/zy/cloud/wms/manager/entity/dataSummary.java | 14 +++++++
src/main/webapp/views/itemManager/itemManager.html | 6 +-
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 16 +++++++
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 24 ++++++++----
src/main/webapp/views/itemBusiness/itemBusiness.html | 4 +-
6 files changed, 52 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 b87067d..95fcd03 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -113,10 +113,10 @@
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
- item.setType("1");
- if (!item.getType().equals("1")) {
- throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
- }
+ //item.setType("1");
+// if (!item.getType().equals("1")) {
+// throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
+// }
Item name = itemService.selectOne(new EntityWrapper<Item>()
.eq("name", item.getName()));
if (!Cools.isEmpty(name)) {
@@ -139,17 +139,25 @@
@RequestMapping(value = "/item/update/auth")
@ManagerAuth
public R update(Item item){
+ EntityWrapper<Item> wapper = new EntityWrapper<Item>();
+ Item newitem = itemService.selectOne(wapper.eq("id", item.getId()));
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
- item.setType("1");
- if (!item.getType().equals("1")) {
- throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
- }
+// item.setType("1");
+// if (!item.getType().equals("1")) {
+// throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
+// }
// item.setRealMonth(1);
// if (item.getRealMonth() < 0){
// throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
// }
+ if(!(newitem.getStartTime()==null || newitem.getEndTime()==null || newitem.getRealStartTime()==null || newitem.getRealEndTime()==null)){
+ item.setStartTime(newitem.getStartTime());
+ item.setEndTime(newitem.getEndTime());
+ item.setRealEndTime(newitem.getRealEndTime());
+ item.setRealStartTime(newitem.getRealStartTime());
+ }
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 a21352c..36943a1 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -313,6 +313,20 @@
return R.ok().add(itemsDTOs);
}
-
+ /**
+ * 椤圭洰姹囨�绘暟鎹�
+ */
+ @RequestMapping("/projectPlan/dataSummary")
+ public R dataSummary(){
+ dataSummary data = new dataSummary();
+ 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)));//宸插畬宸ユ湭楠屾敹鏁伴噺
+ return R.ok().add(data);
+ }
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/dataSummary.java b/src/main/java/zy/cloud/wms/manager/entity/dataSummary.java
new file mode 100644
index 0000000..06fb507
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/entity/dataSummary.java
@@ -0,0 +1,14 @@
+package zy.cloud.wms.manager.entity;
+
+import lombok.Data;
+
+@Data
+public class dataSummary {
+ private Integer totalQuantity;//椤圭洰鎬诲叡鏁伴噺
+ private Integer intoSum;//闆嗘垚椤圭洰鏁�
+ private Integer wrongInto;//闈為泦鎴愰」鐩暟
+ private Integer inspected;//宸查獙鏀堕」鐩暟閲�
+ private Integer wrongInspected;//鏈獙鏀堕」鐩暟閲�
+ private Integer finished;//宸插畬宸ユ湭楠屾敹鏁伴噺
+
+}
diff --git a/src/main/webapp/views/item/item.html b/src/main/webapp/views/item/item.html
index 1c97c6b..24c5714 100644
--- a/src/main/webapp/views/item/item.html
+++ b/src/main/webapp/views/item/item.html
@@ -57,9 +57,9 @@
<div class="layui-row">
<div class="layui-col-md6">
<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="uuid" placeholder="璇疯緭鍏ラ」鐩紪鍙�" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="uuid" placeholder="璇疯緭鍏ラ」鐩紪鍙�" >
</div>
</div>
<div class="layui-form-item">
diff --git a/src/main/webapp/views/itemBusiness/itemBusiness.html b/src/main/webapp/views/itemBusiness/itemBusiness.html
index 1cfa6a2..d355f6a 100644
--- a/src/main/webapp/views/itemBusiness/itemBusiness.html
+++ b/src/main/webapp/views/itemBusiness/itemBusiness.html
@@ -57,9 +57,9 @@
<div class="layui-row">
<div class="layui-col-md6">
<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="uuid" placeholder="璇疯緭鍏ラ」鐩紪鍙�" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="uuid" placeholder="璇疯緭鍏ラ」鐩紪鍙�">
</div>
</div>
<div class="layui-form-item">
diff --git a/src/main/webapp/views/itemManager/itemManager.html b/src/main/webapp/views/itemManager/itemManager.html
index 7c4e4f9..42de3cf 100644
--- a/src/main/webapp/views/itemManager/itemManager.html
+++ b/src/main/webapp/views/itemManager/itemManager.html
@@ -57,9 +57,9 @@
<div class="layui-row">
<div class="layui-col-md6">
<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="uuid" placeholder="璇疯緭鍏ラ」鐩紪鍙�" lay-vertype="tips" lay-verify="required">
+ <input class="layui-input" name="uuid" placeholder="璇疯緭鍏ラ」鐩紪鍙�">
</div>
</div>
<div class="layui-form-item">
@@ -77,7 +77,7 @@
<div class="layui-form-item">
<label class="layui-form-label">棰勮瀹夎鏃ユ湡: </label>
<div class="layui-input-block">
- <input class="layui-input" name="" id="planinDate" placeholder="璇疯緭鍏ラ璁″畨瑁呮棩鏈�" lay-vertype="tips">
+ <input class="layui-input" name="planinDate" id="planinDate" placeholder="璇疯緭鍏ラ璁″畨瑁呮棩鏈�" lay-vertype="tips">
</div>
</div>
<div class="layui-form-item">
--
Gitblit v1.9.1