From c2f77cb1c01b8215fd2fc8c76fd4180629b7f08f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 12 九月 2022 14:47:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 e9a647a..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
@@ -2,21 +2,18 @@
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.ArrayList;
import java.util.Date;
import java.util.List;
@@ -26,6 +23,8 @@
private ProjectPlanService planService;
@Autowired
private FlowStatusService flowStatusService;
+ @Autowired
+ private ItemService itemService;
@Override
public Item selectByName(String name) {
@@ -49,8 +48,9 @@
@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();
@@ -73,4 +73,7 @@
public List<Item> finished(){
return baseMapper.finished();
}
+
+
+
}
--
Gitblit v1.9.1