From 0c9b8fe24e495da1f5e3362fa6b36acc41617cb7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 29 六月 2023 11:35:19 +0800
Subject: [PATCH] 优化寻车，出库问题
---
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index b2ea12f..0bf2156 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -1,6 +1,7 @@
package com.zy.asrs.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
@@ -11,7 +12,7 @@
@Repository
public interface WrkMastMapper extends BaseMapper<WrkMast> {
- WrkMast selectByLocNo(@Param("sourceLocNo") String sourceLocNo);
+ WrkMast selectBySourceLocNo(@Param("sourceLocNo") String sourceLocNo);
// @Select("select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type <> 103 and io_type <> 104 and io_type <> 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no")
List<WrkMast> selectToBeCompleteData();
@@ -31,7 +32,8 @@
// 鍏ュ簱绗笁姝ワ紝褰撳爢鍨涙満鎶婅揣鏀惧叆搴撲綅鏃�
// @Select("select top 1 from dbo.asr_wrk_mast where wrk_no=#{workNo}")
- WrkMast selectPakInStep7(@Param("workNo")Integer workNo);
+ WrkMast selectCrnWaiting(@Param("workNo")Integer workNo);
+ WrkMast selectCrnWaiting2(@Param("workNo")Integer workNo);
WrkMast selectPakInStep45(@Param("workNo")Integer workNo);
@@ -39,11 +41,15 @@
// 鎷ｆ枡鍐嶅叆搴撴椂锛岀珯鐐规湁鐗╀笖闇�姹傛椂鏌ヨ
// @Select("select top 1 * from asr_wrk_mast where wrk_no=#{workNo} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104)")
- WrkMast selectPickStep(@Param("barcode")String barcode);
+ WrkMast selectPickStep(@Param("wrkNo")Short wrkNo);
+
+ WrkMast selectPickStepByBarcode(@Param("barcode")String barcode);
// 鍑哄簱绗竴姝ワ紝浠庡簱浣嶅埌鍫嗗灈鏈哄嚭搴撶珯
// @Select("select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc")
- WrkMast selectPakOutStep11(@Param("crnNo")Integer crnNO, @Param("sourceStaNo")Integer sourceStaNo);
+ WrkMast selectPakOutStep111215(@Param("crnNo")Integer crnNo, @Param("sourceStaNo")Integer sourceStaNo);
+
+ List<WrkMast> selectWorkingOfPakOutBySource(@Param("locNos") List<String> locNos);
// 鍑哄簱绗簩姝ワ紝浠庡爢鍨涙満鍑哄簱绔欏埌鐩爣鍑哄簱绔欙紝鍫嗗灈鏈哄嚭搴撶珯鏈夌墿鏃舵墽琛�
// @Select("select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC")
@@ -74,4 +80,33 @@
@Update("update cust_wait_pakin set io_status='F' where zpallet = #{barcode}")
int updateWaitPakInStep2(String barcode);
+ @Update("update asr_wrk_mast set ste_no = null where wrk_no = #{wrkNo}")
+ int setSteEmpty(Integer wrkNo);
+
+ WrkMast selectPakin(@Param("crnNo")Integer crnNo, @Param("steNo")Integer steNo);
+
+ WrkMast selectPakout(@Param("crnNo")Integer crnNo, @Param("steNo")Integer steNo);
+
+ WrkMast selectWorkingByCrn(@Param("crnNo")Integer crnNo);
+
+ WrkMast selectPakinWorkingByGroupLoc(@Param("locNos")List<String> locNos);
+
+ WrkMast selectPakoutWorkingByGroupLoc(@Param("locNos")List<String> locNos);
+
+ List<WrkMast> selectAll(@Param("staNo")Integer staNo);
+
+ WrkMast selectAllC();
+
+ WrkMast selectRackInStep48(Short workNo,Integer staNo);
+
+ WrkMast selectByWorkNo(Integer workNo);
+
+ WrkMast selectLiftStep262327();
+
+ WrkMast selectByWorkNo372428(Integer workNo);
+
+ List<WrkMast> selectBy2125();
+
+ //鏌ヨ鎸囧畾妤煎眰寰呭垎閰嶈溅杈嗙殑浠诲姟
+ List<LocMast> selectNoShuttleWrkByLev(String lev);
}
--
Gitblit v1.9.1