From 778d3d8b387ca0a8d1b51ef68f783fb0b407ef20 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期五, 26 七月 2024 11:52:34 +0800
Subject: [PATCH] fix6
---
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/service/impl/OmProductionOrdeInfoServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
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..23a4a84 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
@@ -39,6 +39,18 @@
}
/**
+ * 鏌ヨ鐢熶骇宸ュ崟
+ *
+ * @param ids 鐢熶骇宸ュ崟涓婚敭
+ * @return 鐢熶骇宸ュ崟
+ */
+ @Override
+ public OmProductionOrdeInfo selectOmProductionOrdeInfoByIds(Long[] ids)
+ {
+ return omProductionOrdeInfoMapper.selectOmProductionOrdeInfoByIds(ids);
+ }
+
+ /**
* 鏌ヨ鐢熶骇宸ュ崟鍒楄〃
*
* @param omProductionOrdeInfo 鐢熶骇宸ュ崟
@@ -47,6 +59,11 @@
@Override
public List<OmProductionOrdeInfo> selectOmProductionOrdeInfoList(OmProductionOrdeInfo omProductionOrdeInfo)
{
+ if(omProductionOrdeInfo.getDateConditions()!=null){
+ String[] conditions = omProductionOrdeInfo.getDateConditions();
+ omProductionOrdeInfo.setStartTime(conditions[0]);
+ omProductionOrdeInfo.setEndTime(conditions[1]);
+ }
return omProductionOrdeInfoMapper.selectOmProductionOrdeInfoList(omProductionOrdeInfo);
}
@@ -60,8 +77,6 @@
public int insertOmProductionOrdeInfo(OmProductionOrdeInfo omProductionOrdeInfo)
{
omProductionOrdeInfo.setCreateTime(DateUtils.getNowDate());
- Integer streamNumber = omProductionOrdeInfoMapper.getMaxStreamNumber();
- omProductionOrdeInfo.setStreamNumber(String.valueOf(streamNumber+1));
return omProductionOrdeInfoMapper.insertOmProductionOrdeInfo(omProductionOrdeInfo);
}
--
Gitblit v1.9.3