From 1c703617885275090d69c697e82e61f4940c0bdc Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期二, 28 五月 2024 14:20:29 +0800
Subject: [PATCH] 380新产品,优化

---
 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