From eb6f654fe2693d94e62c350638179b3cc95a4fb0 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 五月 2024 10:39:23 +0800
Subject: [PATCH] 修改发货删除
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java | 72 +++++++++++++++++++++++++++++------
1 files changed, 59 insertions(+), 13 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java
index fb541a0..75c9eb4 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ProductionSchedulingService.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.example.erp.entity.pp.ProductionScheduling;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.mapper.pp.ProductionSchedulingMapper;
@@ -22,22 +23,22 @@
@Autowired
ProductionSchedulingMapper productionSchedulingMapper;
- //甯︽椂闂存煡璇�
- public Map<String, Object> SelectSchedulingSv(String selectTime1, String selectTime2, String orderId,String processes, Integer state, ProductionScheduling productionScheduling ) {
+ //鏈帓浜ф煡璇�
+ public Map<String, Object> selectSchedulingSv(String selectTime1, String selectTime2, String orderId,String processes, Integer state, ProductionScheduling productionScheduling ) {
Map<String, Object> map = new HashMap<>();
- if(orderId.equals("null")){
+ if("null".equals(orderId)){
orderId="";
}
- if (processes.equals("null")){
+ if ("null".equals(processes)){
processes="";
}
if (state==2){//宸叉帓浜�
- map.put("data", productionSchedulingMapper.SelectOkSchedulingMp(selectTime1, selectTime2,orderId,processes, productionScheduling));
+ map.put("data", productionSchedulingMapper.selectOkSchedulingMp(selectTime1, selectTime2,orderId,processes, productionScheduling));
}else if (state==1){//鏈帓浜�
- map.put("data", productionSchedulingMapper.SelectNoSchedulingMp(selectTime1, selectTime2,orderId,processes, productionScheduling));
+ map.put("data", productionSchedulingMapper.selectNoSchedulingMp(selectTime1, selectTime2,orderId,processes, productionScheduling));
}
@@ -46,20 +47,28 @@
//棣栨鏌ヨ鎺掍骇鏁版嵁
- public Map<String, Object> selectLastScheduling(String selectTime1, String selectTime2,ProductionScheduling productionScheduling ) {
+ public Map<String, Object> selectLastScheduling(String selectTime1, String selectTime2,String processes,String orderId,ProductionScheduling productionScheduling ) {
Map<String, Object> map = new HashMap<>();
- map.put("data", productionSchedulingMapper.selectLastSchedulingMp(selectTime1, selectTime2, productionScheduling));
+ if("null".equals(orderId)){
+ orderId="";
+ }
+ if ("null".equals(processes)){
+
+ processes="";
+ }
+ map.put("data", productionSchedulingMapper.selectLastSchedulingMp(selectTime1, selectTime2,processes,orderId, productionScheduling));
+ map.put("process", productionSchedulingMapper.selectProcess());
return map;
}
//甯﹁鍗曞彿鏌ヨ
- public Map<String, Object> SelectSchedulingNotSv(String selectTime1, String selectTime2, String orderId, String processes, Integer state, ProductionScheduling productionScheduling) {
+ public Map<String, Object> selectSchedulingNotSv(String selectTime1, String selectTime2, String orderId, String processes, Integer state, ProductionScheduling productionScheduling) {
Map<String, Object> map = new HashMap<>();
- map.put("data", productionSchedulingMapper.SelectSchedulingNotMp(selectTime1, selectTime2,orderId,processes, productionScheduling));
+ map.put("data", productionSchedulingMapper.selectSchedulingNotMp(selectTime1, selectTime2,orderId,processes, productionScheduling));
return map;
}
- public Boolean AddSchedulingSv(Map<String, Object> object) {
+ public Boolean addSchedulingSv(Map<String, Object> object) {
String userName = "";
if (object.get("userName") != null) {
userName = object.get("userName").toString();
@@ -81,8 +90,11 @@
List<ProductionScheduling> schedulinglist = JSONArray.parseArray(JSONObject.toJSONString(object.get("scheduling")), ProductionScheduling.class);
if (!schedulinglist.isEmpty()) {
for (ProductionScheduling productionScheduling : schedulinglist) {
- productionSchedulingMapper.insertSelective(schedulingId,productionScheduling.getOrderId(),productionScheduling.getOrderNumber(),processes,productionScheduling.getSchedulingQuantity(),productionScheduling.getScheduledStartTime(),productionScheduling.getPlanEndTime(),productionScheduling.getNotes());
- // System.out.println(productionScheduling.getOrderNumber()+"***"+productionScheduling.getOrderId());
+ //鏌ヨ宸叉帓浜у伐搴忔暟閲�
+ // Integer num = productionSchedulingMapper.selectNumberMp(productionScheduling.getOrderId(),productionScheduling.getOrderNumber(),processes);
+
+ productionSchedulingMapper.insertSelective(schedulingId,productionScheduling.getOrderId(),productionScheduling.getOrderNumber(),productionScheduling.getTechnologyNumber(),processes,productionScheduling.getSchedulingQuantity(),productionScheduling.getScheduledStartTime(),productionScheduling.getPlanEndTime(),productionScheduling.getNotes());
+ //System.out.println(productionScheduling.getOrderNumber()+"***"+productionScheduling.getTechnologyNumber());
}
return true;
}
@@ -92,4 +104,38 @@
}
}
+
+ public boolean deleteSchedulingSv(Map<String, Object> object) throws Exception {
+ JSONObject objJson = new JSONObject(object);
+ List<ProductionScheduling> Scheduling = JSONArray.parseArray(JSONObject.toJSONString(objJson.get("scheduling")), ProductionScheduling.class);
+ if (!Scheduling.isEmpty()) {
+ for (ProductionScheduling productionScheduling : Scheduling) {
+ productionSchedulingMapper.deleteSchedulingMp(productionScheduling.getSchedulingId());
+ // System.out.println(productionScheduling.getOrderNumber()+"***"+productionScheduling.getOrderId());
+ }
+ return true;
+ }
+ else {
+ return false;
+ }
+ }
+
+ public boolean examineSchedulingSv(Map<String, Object> object) {
+ String userName = "";
+ if (object.get("userName") != null) {
+ userName = object.get("userName").toString();
+ }
+ List<ProductionScheduling> schedulinglist = JSONArray.parseArray(JSONObject.toJSONString(object.get("scheduling")), ProductionScheduling.class);
+
+ if (!schedulinglist.isEmpty()) {
+ for (ProductionScheduling productionScheduling : schedulinglist) {
+ productionSchedulingMapper.examineSchedulingMp(productionScheduling.getSchedulingId(),userName);
+ // System.out.println(productionScheduling.getOrderNumber()+"***"+productionScheduling.getOrderId());
+ }
+ return true;
+ }
+ else {
+ return false;
+ }
+ }
}
--
Gitblit v1.8.0