From 0aa1c9d1a42e2ac5639228d23dfedbc03ded6fb5 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期三, 30 三月 2022 16:28:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java
index a427bb8..e9a647a 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java
@@ -1,6 +1,7 @@
package zy.cloud.wms.manager.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import zy.cloud.wms.manager.entity.FlowStatus;
@@ -15,6 +16,7 @@
import zy.cloud.wms.manager.service.ProjectPlanService;
import zy.cloud.wms.manager.service.ProjectTypeService;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -32,6 +34,17 @@
return this.selectOne(new EntityWrapper<>(item));
}
+ @Override
+ public Page<Item> chaoPirce(Page<Item> page,String uuid){
+ page.setRecords(baseMapper.chaoPrice(page.getCondition(),uuid));
+ return page;
+ }
+ @Override
+ public Page<Item> chaoTime(Page<Item> page,String uuid){
+ page.setRecords(baseMapper.chaoTime(page.getCondition(),uuid));
+ return page;
+ }
+
@Transactional
@Override
public void insertAll(Item item) {
@@ -44,10 +57,6 @@
projectPlan.setItemId(item.getId());
projectPlan.setWeightNum(oneType.getWeightNum());
projectPlan.setFlowId(oneType.getId());
- projectPlan.setStartTime(item.getStartTime());
- projectPlan.setEndTime(item.getEndTime());
- projectPlan.setRealStartTime(null);
- projectPlan.setRealEndTime(null);
projectPlan.setCreateId(item.getCreateBy());
projectPlan.setCreateTime(item.getCreateTime());
projectPlan.setModifyId(item.getUpdateBy());
@@ -56,4 +65,12 @@
}
}
+ @Override
+ public List<Item> inspected(){
+ return baseMapper.inspected();
+ }
+ @Override
+ public List<Item> finished(){
+ return baseMapper.finished();
+ }
}
--
Gitblit v1.9.1