From 5fc5876a94dcbd5e9a9fb91f5e3c01211e9c2d96 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期三, 24 一月 2024 16:59:19 +0800
Subject: [PATCH] 返修标记
---
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/service/impl/OmProductionOrdeInfoServiceImpl.java | 7 +++++--
1 files changed, 5 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..8a0139e 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
@@ -47,6 +47,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 +65,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