From 1de44b26c41de44548684bfb475d40fc52af9b71 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期三, 17 一月 2024 18:52:26 +0800
Subject: [PATCH] 工单优化
---
jcdm-ui/src/views/main/om/productionOrde/index.vue | 3 ++-
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java | 10 ++++++++--
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/service/impl/OmProductionOrdeInfoServiceImpl.java | 4 ++--
jcdm-ui/src/views/main/bs/orderScheduling/index.vue | 4 ++--
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 4 +++-
5 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
index 60bbb70..47d2a35 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
@@ -3,6 +3,7 @@
import java.util.List;
import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.jcdm.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -44,8 +45,13 @@
public List<BsOrderScheduling> selectBsOrderSchedulingList(BsOrderScheduling bsOrderScheduling)
{
-// if(StrUtil.isNotBlank(bsOrderScheduling.getOperateTime())){
-//// String[] dateArray = gson.fromJson(jsonString, String[].class);
+// if(bsOrderScheduling.getOperateTime()!=null){
+// ObjectMapper objectMapper = new ObjectMapper();
+// try {
+// String[] dateArray = objectMapper.readValue(bsOrderScheduling.getOperateTime(), String[].class);
+// }catch (Exception e){
+//
+// }
//
// }
return bsOrderSchedulingMapper.selectBsOrderSchedulingList(bsOrderScheduling);
diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
index bafb93a..586fe63 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
@@ -194,7 +194,9 @@
} catch (Exception e) {
return error("鎺ユ敹澶辫触锛佽妫�鏌ラ�氱煡鍗曞彿");
}
+ }else {
+ return warn("璇ヨ鍗曞凡鎺ユ敹瀹屾瘯锛屼笉鑳介噸澶嶆帴鏀讹紒");
}
- return warn("璇ヨ鍗曞凡鎺ユ敹瀹屾瘯锛屼笉鑳介噸澶嶆帴鏀讹紒");
+ return AjaxResult.success("鎺ユ敹鎴愬姛锛�");
}
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/service/impl/OmProductionOrdeInfoServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/service/impl/OmProductionOrdeInfoServiceImpl.java
index d7e1aeb..db68977 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/service/impl/OmProductionOrdeInfoServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/service/impl/OmProductionOrdeInfoServiceImpl.java
@@ -60,8 +60,8 @@
public int insertOmProductionOrdeInfo(OmProductionOrdeInfo omProductionOrdeInfo)
{
omProductionOrdeInfo.setCreateTime(DateUtils.getNowDate());
- Integer streamNumber = omProductionOrdeInfoMapper.getMaxStreamNumber();
- omProductionOrdeInfo.setStreamNumber(String.valueOf(streamNumber+1));
+ /* Integer streamNumber = omProductionOrdeInfoMapper.getMaxStreamNumber();*/
+ /* omProductionOrdeInfo.setStreamNumber(String.valueOf(streamNumber+1));*/
return omProductionOrdeInfoMapper.insertOmProductionOrdeInfo(omProductionOrdeInfo);
}
diff --git a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
index aefd1b7..be23462 100644
--- a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
+++ b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
@@ -516,8 +516,8 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
- // this.queryParams.pageNum = 1;
- // this.getList();
+ this.queryParams.pageNum = 1;
+ this.getList();
this.$modal.msgSuccess(this.queryParams.operateTime);
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index 00823a4..34bcf4b 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -552,7 +552,8 @@
getProductionNotice(){
getProductionNotice(this.queryParams).then(response => {
- this.$modal.msgSuccess(response.data.msg);
+
+ this.$modal.msgSuccess(response.msg);
this.queryParams = {}
this.getList();
});
--
Gitblit v1.9.3