From bd6095e7af86faf7ed0a5ca188775aeac7b031f2 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 06 九月 2022 09:40:55 +0800
Subject: [PATCH] Merge branch 'zypms' of http://47.97.1.152:5880/r/wms_saas into zypms
---
src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 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..a07b868 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,19 +1,18 @@
package zy.cloud.wms.manager.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.Cools;
+import com.core.exception.CoolException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-import zy.cloud.wms.manager.entity.FlowStatus;
-import zy.cloud.wms.manager.entity.ProjectPlan;
-import zy.cloud.wms.manager.entity.ProjectType;
+import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.mapper.ItemMapper;
-import zy.cloud.wms.manager.entity.Item;
import zy.cloud.wms.manager.service.FlowStatusService;
import zy.cloud.wms.manager.service.ItemService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import zy.cloud.wms.manager.service.ProjectPlanService;
-import zy.cloud.wms.manager.service.ProjectTypeService;
import java.util.Date;
import java.util.List;
@@ -24,6 +23,8 @@
private ProjectPlanService planService;
@Autowired
private FlowStatusService flowStatusService;
+ @Autowired
+ private ItemService itemService;
@Override
public Item selectByName(String name) {
@@ -32,22 +33,30 @@
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) {
this.insert(item);
+ Integer isAsrs = item.getType().equals("10")? 1: 0;
List<FlowStatus> allTypes = flowStatusService.selectList(new EntityWrapper<FlowStatus>()
- .eq("type", item.getType())
+ .eq("is_asrs", isAsrs)
.orderBy("weight_num",true));
for (FlowStatus oneType : allTypes) {
ProjectPlan projectPlan = new ProjectPlan();
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,15 @@
}
}
+ @Override
+ public List<Item> inspected(){
+ return baseMapper.inspected();
+ }
+ @Override
+ public List<Item> finished(){
+ return baseMapper.finished();
+ }
+
+
+
}
--
Gitblit v1.9.1