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 | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 28f7922..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
@@ -26,10 +26,10 @@
//鏈帓浜ф煡璇�
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="";
}
@@ -47,9 +47,16 @@
//棣栨鏌ヨ鎺掍骇鏁版嵁
- 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;
}
@@ -84,10 +91,10 @@
if (!schedulinglist.isEmpty()) {
for (ProductionScheduling productionScheduling : schedulinglist) {
//鏌ヨ宸叉帓浜у伐搴忔暟閲�
- Integer num = productionSchedulingMapper.selectNumberMp(productionScheduling.getOrderId(),productionScheduling.getOrderNumber(),processes);
+ // Integer num = productionSchedulingMapper.selectNumberMp(productionScheduling.getOrderId(),productionScheduling.getOrderNumber(),processes);
- productionSchedulingMapper.insertSelective(schedulingId,productionScheduling.getOrderId(),productionScheduling.getOrderNumber(),processes,productionScheduling.getSchedulingQuantity(),productionScheduling.getScheduledStartTime(),productionScheduling.getPlanEndTime(),productionScheduling.getNotes());
- // System.out.println(productionScheduling.getOrderNumber()+"***"+productionScheduling.getOrderId());
+ 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;
}
--
Gitblit v1.8.0