From a8b9893712835e3e4ebb94c3563234f7ed81d089 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期四, 07 四月 2022 15:02:24 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 62 +++++++++++++++++++++++--------
1 files changed, 46 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 e783404..01e0660 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -15,14 +15,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.common.web.BaseController;
-import zy.cloud.wms.manager.entity.Cstmr;
-import zy.cloud.wms.manager.entity.Item;
-import zy.cloud.wms.manager.entity.ProjectPlan;
-import zy.cloud.wms.manager.entity.ProjectType;
-import zy.cloud.wms.manager.service.CstmrService;
-import zy.cloud.wms.manager.service.ItemService;
-import zy.cloud.wms.manager.service.ProjectPlanService;
-import zy.cloud.wms.manager.service.ProjectTypeService;
+import zy.cloud.wms.manager.entity.*;
+import zy.cloud.wms.manager.service.*;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -34,6 +28,8 @@
private ItemService itemService;
@Autowired
private ProjectPlanService planService;
+ @Autowired
+ private FlowStatusService flowStatusService;
@RequestMapping(value = "/item/{id}/auth")
@ManagerAuth
@@ -133,14 +129,6 @@
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();
}
@@ -166,6 +154,16 @@
item.setEndTime(newitem.getEndTime());
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());
@@ -237,4 +235,36 @@
return R.ok();
}
+ /**
+ * 鍒濆鍖栫敓鎴愰」鐩妭鐐�
+ * @param param
+ * @return
+ */
+ @RequestMapping(value = "/item/initPlan/auth")
+ @ManagerAuth
+ public R initPlan(@RequestParam("id") String param){
+ if (param != null){
+ List<ProjectPlan> projectPlans = planService.selectList(new EntityWrapper<ProjectPlan>().eq("item_id",param));
+ if(!Cools.isEmpty(projectPlans) && projectPlans.size()>0){
+ return R.error("璇ラ」鐩凡鏈夎妭鐐硅鍒�");
+ }
+ List<FlowStatus> flowStatuses = flowStatusService.selectList(new EntityWrapper<FlowStatus>());
+ if(!Cools.isEmpty(flowStatuses) && flowStatuses.size()>0){
+ for(FlowStatus flowStatus : flowStatuses){
+ ProjectPlan projectPlan = new ProjectPlan();
+ projectPlan.setItemId(Long.parseLong(param));
+ projectPlan.setWeightNum(flowStatus.getWeightNum());
+ projectPlan.setFlowId(flowStatus.getId());
+ planService.insert(projectPlan);
+ }
+ } else {
+ return R.error("椤圭洰璁″垝鑺傜偣鍩虹鏁版嵁涓虹┖");
+ }
+ } else {
+ return R.error("椤圭洰鍙傛暟閿欒");
+ }
+
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1