From e62ee0fb93bdb95c462c963e88781ed940da648e Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 28 五月 2024 12:30:24 +0800
Subject: [PATCH] # 528
---
/dev/null | 77 --------------------------------------
src/main/java/com/zy/asrs/service/impl/AgvWaitPakinServiceImpl.java | 5 ++
src/main/resources/mapper/AgvLocMastMapper.xml | 2
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 15 +++++++
src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 17 ++++++++
src/main/java/com/zy/asrs/service/AgvWaitPakinService.java | 1
6 files changed, 38 insertions(+), 79 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/AgvWaitPakinService.java b/src/main/java/com/zy/asrs/service/AgvWaitPakinService.java
index 23c615b..c99255a 100644
--- a/src/main/java/com/zy/asrs/service/AgvWaitPakinService.java
+++ b/src/main/java/com/zy/asrs/service/AgvWaitPakinService.java
@@ -13,5 +13,6 @@
public List<AgvWaitPakin> selectByContainerCode(String containerCode);
+ public List<AgvWaitPakin> selectByContainerCode2(String containerCode);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWaitPakinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWaitPakinServiceImpl.java
index f2b9b53..820c2c1 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWaitPakinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWaitPakinServiceImpl.java
@@ -36,4 +36,9 @@
public List<AgvWaitPakin> selectByContainerCode(String containerCode) {
return this.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code",containerCode).eq("io_status","N"));
}
+
+ @Override
+ public List<AgvWaitPakin> selectByContainerCode2(String containerCode) {
+ return this.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code",containerCode));
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index a8b4a0e..3b94ad0 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -600,6 +600,14 @@
String locNo = wrkMast.getLocNo();
agvLocMastService.updateLocStsByLocNo(locNo,"O","",null);
agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
+ if (wrkMast.getIoType() == 1) {
+ List<AgvWaitPakin> agvWaitPakins = agvWaitPakinService.selectByContainerCode2(wrkMast.getBarcode());
+ for (AgvWaitPakin agvWaitPakin : agvWaitPakins) {
+ if (!agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code",agvWaitPakin.getSupp()))) {
+ throw new CoolException("鍏ュ簱閫氱煡妗ｅ彇娑堝け璐�");
+ }
+ }
+ }
// 绉诲簱鍙栨秷
@@ -649,7 +657,12 @@
agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
}
if (wrkMast.getIoType() == 109){
- agvLocMastService.updateLocStsByLocNo(devNo,"O","",(short)getContainerTypeByloc(devNo));
+ if (Cools.isEmpty(wrkMast.getLocNo())) {
+
+ } else {
+ agvLocMastService.updateLocStsByLocNo(devNo,"O","",(short)getContainerTypeByloc(devNo));
+ }
+
}else {
agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
}
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index 6b30542..f55bb6a 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -50,6 +50,7 @@
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
.eq("wrk_sts", 22)
.andNew().eq("io_type",108)
+ .eq("crn_no",2)
);
if (agvWrkMastList.isEmpty()) {
return;
@@ -60,6 +61,22 @@
}
+ @Scheduled(cron = "0/2 * * * * ? ")
+ private void execute5(){
+ List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
+ .eq("wrk_sts", 22)
+ .andNew().eq("io_type",108)
+ .eq("crn_no",3)
+ );
+ if (agvWrkMastList.isEmpty()) {
+ return;
+ }
+ for (AgvWrkMast agvWrkMast : agvWrkMastList) {
+ ReturnT<String> returnT = autoMoveHandler.start2(agvWrkMast);
+ }
+
+ }
+
// 璋冩嫧鍑哄簱
@Scheduled(cron = "0/2 * * * * ? ")
private void execute3(){
diff --git a/src/main/resources/AgvLocDetlMapper.xml b/src/main/resources/AgvLocDetlMapper.xml
deleted file mode 100644
index 613c4d7..0000000
--- a/src/main/resources/AgvLocDetlMapper.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.AgvLocDetlMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.AgvLocDetl">
- <result column="loc_no" property="locNo" />
- <result column="zpallet" property="zpallet" />
- <result column="anfme" property="anfme" />
- <result column="matnr" property="matnr" />
- <result column="maktx" property="maktx" />
- <result column="batch" property="batch" />
- <result column="order_no" property="orderNo" />
-
- <result column="specs" property="specs" />
- <result column="model" property="model" />
- <result column="color" property="color" />
- <result column="brand" property="brand" />
- <result column="unit" property="unit" />
- <result column="price" property="price" />
- <result column="sku" property="sku" />
- <result column="units" property="units" />
- <result column="barcode" property="barcode" />
- <result column="origin" property="origin" />
- <result column="manu" property="manu" />
- <result column="manu_date" property="manuDate" />
- <result column="item_num" property="itemNum" />
- <result column="safe_qty" property="safeQty" />
- <result column="weight" property="weight" />
- <result column="length" property="length" />
- <result column="volume" property="volume" />
- <result column="three_code" property="threeCode" />
- <result column="supp" property="supp" />
- <result column="supp_code" property="suppCode" />
- <result column="be_batch" property="beBatch" />
- <result column="dead_time" property="deadTime" />
- <result column="dead_warn" property="deadWarn" />
- <result column="source" property="source" />
- <result column="inspect" property="inspect" />
- <result column="danger" property="danger" />
-
- <result column="modi_user" property="modiUser" />
- <result column="modi_time" property="modiTime" />
- <result column="appe_user" property="appeUser" />
- <result column="appe_time" property="appeTime" />
- <result column="memo" property="memo" />
- <result column="stock_freeze" property="stockFreeze" />
- </resultMap>
-
- <select id="getStockStatis" resultType="com.zy.asrs.entity.AgvLocDetl">
- select * from
- (
- select
- ROW_NUMBER() over (order by sum(a.anfme) desc) as row
- , a.matnr
- , sum(a.anfme) as anfme
- from agv_loc_detl a
- where 1=1
- <include refid="stockOutCondition"></include>
- group by a.matnr
- ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
- </select>
-
- <select id="getStockStatisCount" parameterType="java.util.Map" resultType="java.lang.Integer">
- select count(1) as count from
- (
- select
- a.matnr
- from agv_loc_detl a
- where 1=1
- <include refid="stockOutCondition"></include>
- group by a.matnr
- ) b
- </select>
-
-
-</mapper>
diff --git a/src/main/resources/mapper/AgvLocMastMapper.xml b/src/main/resources/mapper/AgvLocMastMapper.xml
index e14eb02..0ee407e 100644
--- a/src/main/resources/mapper/AgvLocMastMapper.xml
+++ b/src/main/resources/mapper/AgvLocMastMapper.xml
@@ -41,7 +41,7 @@
</resultMap>
- <select id="queryFreeLocMast" resultMap="BaseResultMap">
+ <select id="queryFreeLocMast33" resultMap="BaseResultMap">
select
*
from asr_loc_mast
--
Gitblit v1.9.1