From f92b7c526ab73c6e0e41a616a894afd45cb1b552 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 07 一月 2026 00:25:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 3
src/main/java/com/zy/asrs/entity/param/AgvUnlockLoc.java | 12 +
src/main/java/com/zy/asrs/service/LocDetlService.java | 2
src/main/java/com/zy/asrs/mapper/BasAgvLocDetlMapper.java | 1
src/main/resources/mapper/LocDetlMapper.xml | 219 +++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 9 +
src/main/java/com/zy/asrs/controller/MobileController.java | 6
src/main/webapp/static/js/orderPakout/order.js | 2
src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java | 13 -
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 38 +++++
src/main/resources/mapper/BasAgvLocDetlMapper.xml | 5
src/main/java/com/zy/asrs/controller/OutController.java | 51 +++++++
src/main/java/com/zy/asrs/service/MobileService.java | 1
13 files changed, 351 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index daff9ef..eb449cd 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -270,6 +270,12 @@
return R.ok("缁勬墭鎴愬姛");
}
+ @RequestMapping("/AgvUnlockLoc/wcs/auth")
+ public R agvUnlockLoc(@RequestBody AgvUnlockLoc agvUnlockLoc){
+ mobileService.agvUnlockLoc(agvUnlockLoc);
+ return R.ok("绂诲簱鎴愬姛");
+ }
+
@RequestMapping("/kitting/query/auth")
@ManagerAuth(memo = "榻愬鍏ュ簱鏌ヨ")
public R kittingQuery(@RequestBody CombParam combParam){
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index c6c4bd3..1e20214 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -169,6 +169,57 @@
locDtos.add(locDto);
}
}
+ }else if(orderPakOut.getDocType() == 7){
+ for (OrderDetlPakout orderDetl : orderDetlPakouts) {
+ double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+ if (issued <= 0.0D) {
+ continue;
+ }
+ List<LocDetl> locDetls = null;
+ if(orderDetl.getStandby1().equals("123")){
+ locDetls = locDetlService.queryStockAll123(null, exist,orderDetl.getMatnr(), "1");
+
+ }else{
+ locDetls = locDetlService.queryStockAll7(null, exist,orderDetl.getMatnr(), orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ }
+ for (LocDetl locDetl : locDetls) {
+ if (issued > 0) {
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
+ issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
+ locDto.setFrozen(locDetl.getFrozen());
+ locDto.setFrozenLoc(locMast.getFrozen());
+ List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
+ locDto.setStaNos(staNos);
+ locDto.setBrand(orderDetl.getBrand());
+
+ locDto.setStandby1(orderDetl.getStandby1());
+ locDto.setStandby2(orderDetl.getStandby2());
+ locDto.setStandby3(orderDetl.getStandby3());
+ locDto.setBoxType1(orderDetl.getBoxType1());
+ locDto.setBoxType2(orderDetl.getBoxType2());
+ locDto.setBoxType3(orderDetl.getBoxType3());
+ locDtos.add(locDto);
+ exist.add(locDetl.getLocNo());
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ } else {
+ break;
+ }
+ }
+ if (issued > 0) {
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+ locDto.setBrand(orderDetl.getBrand());
+ locDto.setStandby1(orderDetl.getStandby1());
+ locDto.setStandby2(orderDetl.getStandby2());
+ locDto.setStandby3(orderDetl.getStandby3());
+ locDto.setBoxType1(orderDetl.getBoxType1());
+ locDto.setBoxType2(orderDetl.getBoxType2());
+ locDto.setBoxType3(orderDetl.getBoxType3());
+ locDto.setLack(Boolean.TRUE);
+ locDtos.add(locDto);
+ }
+ }
}else {
for (OrderDetlPakout orderDetl : orderDetlPakouts) {
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvUnlockLoc.java b/src/main/java/com/zy/asrs/entity/param/AgvUnlockLoc.java
new file mode 100644
index 0000000..47c212f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/AgvUnlockLoc.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class AgvUnlockLoc {
+ private Integer floorNo;
+ private String reqCode;
+ private String podcode;//鎵樼洏鐮�
+ private String positionCode = "2034";//绔欑偣
+ private String indBind;
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasAgvLocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/BasAgvLocDetlMapper.java
index 16b9925..d7cc1bc 100644
--- a/src/main/java/com/zy/asrs/mapper/BasAgvLocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasAgvLocDetlMapper.java
@@ -11,7 +11,6 @@
@Mapper
@Repository
public interface BasAgvLocDetlMapper extends BaseMapper<BasAgvLocDetl> {
- @Update("update asr_bas_agv_loc_detl set loc_no = #{newLocNo}, modi_time=getDate() where loc_no = #{oldLocNo}")
int updateLocNo(String newLocNo, String oldLocNo);
BasAgvLocDetl selectItem(@Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch,
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 71c9d85..afb3421 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -79,6 +79,9 @@
List<LocDetl> queryStockAll(@Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("matnr")String matnr, @Param("batch")String batch,
@Param("brand")String brand,@Param("standby1")String standby1,@Param("standby2")String standby2,
@Param("standby3")String standby3,@Param("boxType1")String boxType1,@Param("boxType2")String boxType2);
+ List<LocDetl> queryStockAll7(@Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("matnr")String matnr, @Param("standby1")String standby1,@Param("standby2")String standby2,
+ @Param("standby3")String standby3,@Param("boxType1")String boxType1,@Param("boxType2")String boxType2,@Param("boxType3")String boxType3);
+ List<LocDetl> queryStockAll123(@Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("matnr")String matnr, @Param("standby1")String standby);
Double queryStockAnfme(String matnr, String batch);
List<LocDetl> queryStockMatnr(@Param("matnr")String matnr);
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 81c9de2..fb3ed10 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -71,6 +71,8 @@
// List<LocDetl> queryStockAll(String orderNo, Set<String> locNos,String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3);
List<LocDetl> queryStockAll(String orderNo, Set<String> locNos,String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2);
+ List<LocDetl> queryStockAll7(String orderNo, Set<String> locNos,String matnr, String standby1, String standby2, String standby3, String boxType1, String boxType2,String boxType3);
+ List<LocDetl> queryStockAll123(String orderNo, Set<String> locNos,String matnr, String standby1);
Double queryStockAnfme(String matnr, String batch);
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index f635948..a295796 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -47,6 +47,7 @@
void comb(CombParam param, Long userId);
void combAuto(CombParam param, Long userId);
void combAgv(CombParam param, Long userId);
+ void agvUnlockLoc(AgvUnlockLoc agvUnlockLoc);
/**
* 榻愬鍏ュ簱鏌ヨ
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 3e96d5a..718541a 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -126,6 +126,15 @@
}
@Override
+ public List<LocDetl> queryStockAll7(String orderNo, Set<String> locNos,String matnr, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
+ return this.baseMapper.queryStockAll7(orderNo,locNos, matnr,standby1,standby2,standby3,boxType1,boxType2,boxType3);
+ }
+
+ @Override
+ public List<LocDetl> queryStockAll123(String orderNo, Set<String> locNos,String matnr, String standby1) {
+ return this.baseMapper.queryStockAll123(orderNo,locNos, matnr,standby1);
+ }
+ @Override
public Double queryStockAnfme(String matnr, String batch) {
return this.baseMapper.queryStockAnfme(matnr, batch);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 05bdb79..8121973 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -29,6 +29,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import javax.annotation.Resource;
import java.util.*;
@@ -1680,4 +1681,41 @@
throw new CoolException(locDetl.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
}
}
+ @Override
+ public void agvUnlockLoc(AgvUnlockLoc agvUnlockLoc){
+ Date now = new Date();
+ if(agvUnlockLoc.getFloorNo().equals(1)){
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",agvUnlockLoc.getPositionCode()));
+ if(locMast != null){
+ locMast.setLocSts("O");
+ locMast.setBarcode("");
+ locMast.setIoTime(now);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException(agvUnlockLoc.getPositionCode() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
+ }
+ }
+ }else{
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",agvUnlockLoc.getPositionCode()));
+ AgvBindCtnrAndBinTwoParam agvBindCtnrAndBinTwoParam = new AgvBindCtnrAndBinTwoParam();
+ agvBindCtnrAndBinTwoParam.setReqCode(String.valueOf(snowflakeIdWorker.nextId()));
+ agvBindCtnrAndBinTwoParam.setPodcode(agvUnlockLoc.getPodcode());
+ agvBindCtnrAndBinTwoParam.setPositionCode(agvUnlockLoc.getPositionCode());
+ agvBindCtnrAndBinTwoParam.setIndBind("0");;
+ ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV搴撲綅瑙ｇ粦",
+ AgvConstant.AGV_URL+"/"+AgvConstant.AGV_hikRpcService,AgvConstant.getAGVADAPTOR(2), agvBindCtnrAndBinTwoParam);
+ if (resultBind.getCode()!=1){
+ if(locMast != null){
+ locMast.setLocSts("O");
+ locMast.setBarcode("");
+ locMast.setIoTime(now);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException(agvUnlockLoc.getPositionCode() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
+ }
+ }
+ }
+ }
+
+ }
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
index 79b9d7c..aacc34f 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastAgvHandler.java
@@ -37,7 +37,7 @@
private OpenService openService;
- public ReturnT<String> start(BasAgvMast basAgvMast) {
+ public ReturnT<String> start(BasAgvMast basAgvMast) {
try {
Date now = new Date();
switch (basAgvMast.getIoType()){
@@ -60,16 +60,14 @@
basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getSourceLocNo()));
basAgvWrkDetlService.delete(new EntityWrapper<BasAgvWrkDetl>().eq("wrk_no", basAgvMast.getTaskNo()));
basAgvMast.setStatus(3);
- basAgvMastService.updateById(basAgvMast);
- openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
+ if(basAgvMastService.updateById(basAgvMast)){
+ openService.agvBindAndBin(String.valueOf(basAgvMast.getTaskNo()));
+ }
break;
case 1:
LocMast sourceLoc1 = locMastService.selectById(basAgvMast.getSourceLocNo());
LocMast locMast1 = locMastService.selectById(basAgvMast.getLocNo());
List<BasAgvLocDetl> locDetls1 = basAgvLocDetlService.selectList(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getLocNo()));
- if (!locDetls1.isEmpty()) {
- basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getLocNo()));
- }
// 淇敼鐩爣搴撲綅鐘舵�� ==> .locSts
locMast1.setLocSts("F");
locMast1.setBarcode(sourceLoc1.getBarcode());
@@ -98,7 +96,6 @@
}
}
- basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getSourceLocNo()));
basAgvWrkDetlService.delete(new EntityWrapper<BasAgvWrkDetl>().eq("wrk_no", basAgvMast.getTaskNo()));
// basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getLocNo()));
basAgvMast.setStatus(4);
@@ -161,7 +158,7 @@
}
}
-// basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getLocNo()));
+ basAgvLocDetlService.delete(new EntityWrapper<BasAgvLocDetl>().eq("loc_no", basAgvMast.getSourceLocNo()));
basAgvWrkDetlService.delete(new EntityWrapper<BasAgvWrkDetl>().eq("wrk_no", basAgvMast.getTaskNo()));
basAgvMast.setStatus(3);
if(basAgvMast.getFloorNo() == 2 || basAgvMast.getFloorNo() == 3){
diff --git a/src/main/resources/mapper/BasAgvLocDetlMapper.xml b/src/main/resources/mapper/BasAgvLocDetlMapper.xml
index 9375b50..5fa2c81 100644
--- a/src/main/resources/mapper/BasAgvLocDetlMapper.xml
+++ b/src/main/resources/mapper/BasAgvLocDetlMapper.xml
@@ -127,4 +127,9 @@
and matnr = #{matnr}
<include refid="batchSeq"></include>
</select>
+ <update id="updateLocNo">
+ update asr_bas_agv_loc_detl
+ set loc_no = #{newLocNo}, modi_time=getDate()
+ where loc_no = #{oldLocNo}
+ </update>
</mapper>
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index d32628d..c9ff0bc 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -52,7 +52,16 @@
<result column="box_type2" property="boxType2" />
<result column="box_type3" property="boxType3" />
</resultMap>
-
+ <sql id="batchSeq123">
+ <choose>
+ <when test="standby1 != null and standby1 != ''">
+ and d.standby1 = #{standby1}
+ </when>
+ <otherwise>
+ and (d.standby1 IS NULL OR d.standby1 = '')
+ </otherwise>
+ </choose>
+ </sql>
<sql id="batchSeq">
<choose>
<when test="batch != null and batch != ''">
@@ -136,6 +145,56 @@
and (a.brand IS NULL OR a.brand = '')
</otherwise>
</choose>
+ <choose>
+ <when test="standby1 != null and standby1 != ''">
+ and a.standby1 = #{standby1}
+ </when>
+ <otherwise>
+ and (a.standby1 IS NULL OR a.standby1 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="standby2 != null and standby2 != ''">
+ and a.standby2 = #{standby2}
+ </when>
+ <otherwise>
+ and (a.standby2 IS NULL OR a.standby2 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="standby3 != null and standby3 != ''">
+ and a.standby3 = #{standby3}
+ </when>
+ <otherwise>
+ and (a.standby3 IS NULL OR a.standby3 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="boxType1 != null and boxType1 != ''">
+ and a.box_type1 = #{boxType1}
+ </when>
+ <otherwise>
+ and (a.box_type1 IS NULL OR a.box_type1 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="boxType2 != null and boxType2 != ''">
+ and a.box_type2 = #{boxType2}
+ </when>
+ <otherwise>
+ and (a.box_type2 IS NULL OR a.box_type2 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="boxType3 != null and boxType3 != ''">
+ and a.box_type3 = #{boxType3}
+ </when>
+ <otherwise>
+ and (a.box_type3 IS NULL OR a.box_type3 = '')
+ </otherwise>
+ </choose>
+ </sql>
+ <sql id="batchSeq7">
<choose>
<when test="standby1 != null and standby1 != ''">
and a.standby1 = #{standby1}
@@ -740,6 +799,164 @@
desc
</select>
+ <select id="queryStockAll7" resultMap="BaseResultMap">
+ select a.*
+ from asr_loc_detl a
+ left join asr_loc_mast b on a.loc_no = b.loc_no
+ where 1=1
+ and b.loc_sts = 'F'
+ and a.matnr = #{matnr}
+ <if test="orderNo != null and orderNo != ''">
+ and a.order_no = #{orderNo}
+ </if>
+
+ <include refid="batchSeq7"></include>
+
+
+ <if test="locNos != null and locNos.size > 0">
+ and b.loc_no not in
+ <foreach item="item" collection="locNos" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+
+ order by
+ DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
+ desc,
+ NEWID(),
+ case
+ when (left(a.loc_no, 2) = '01') then 0
+ when (left(a.loc_no, 2) = '02') then 1
+ when (left(a.loc_no, 2) = '03') then 1
+ when (left(a.loc_no, 2) = '04') then 0
+ when (left(a.loc_no, 2) = '05') then 0
+ when (left(a.loc_no, 2) = '06') then 1
+ when (left(a.loc_no, 2) = '07') then 1
+ when (left(a.loc_no, 2) = '08') then 0
+ when (left(a.loc_no, 2) = '09') then 0
+ when (left(a.loc_no, 2) = '10') then 1
+ when (left(a.loc_no, 2) = '11') then 1
+ when (left(a.loc_no, 2) = '12') then 0
+ when (left(a.loc_no, 2) = '13') then 0
+ when (left(a.loc_no, 2) = '14') then 1
+ when (left(a.loc_no, 2) = '15') then 1
+ when (left(a.loc_no, 2) = '16') then 0
+ when (left(a.loc_no, 2) = '17') then 0
+ when (left(a.loc_no, 2) = '18') then 1
+ when (left(a.loc_no, 2) = '19') then 1
+ when (left(a.loc_no, 2) = '20') then 0
+ when (left(a.loc_no, 2) = '21') then 0
+ when (left(a.loc_no, 2) = '22') then 1
+ when (left(a.loc_no, 2) = '23') then 1
+ when (left(a.loc_no, 2) = '24') then 0
+ when (left(a.loc_no, 2) = '25') then 0
+ when (left(a.loc_no, 2) = '26') then 1
+ when (left(a.loc_no, 2) = '27') then 1
+ when (left(a.loc_no, 2) = '28') then 0
+ when (left(a.loc_no, 2) = '29') then 0
+ when (left(a.loc_no, 2) = '30') then 1
+ when (left(a.loc_no, 2) = '31') then 1
+ when (left(a.loc_no, 2) = '32') then 0
+ when (left(a.loc_no, 2) = '33') then 0
+ when (left(a.loc_no, 2) = '34') then 1
+ when (left(a.loc_no, 2) = '35') then 1
+ when (left(a.loc_no, 2) = '36') then 0
+ when (left(a.loc_no, 2) = '37') then 0
+ when (left(a.loc_no, 2) = '38') then 1
+ when (left(a.loc_no, 2) = '39') then 1
+ when (left(a.loc_no, 2) = '40') then 0
+ when (left(a.loc_no, 2) = '41') then 0
+ when (left(a.loc_no, 2) = '42') then 1
+ when (left(a.loc_no, 2) = '43') then 1
+ when (left(a.loc_no, 2) = '44') then 0
+ when (left(a.loc_no, 2) = '45') then 0
+ when (left(a.loc_no, 2) = '46') then 1
+ when (left(a.loc_no, 2) = '47') then 1
+ when (left(a.loc_no, 2) = '48') then 0
+ else 0
+ end
+ desc
+ </select>
+
+ <select id="queryStockAll123" resultMap="BaseResultMap">
+ select a.*
+ from asr_loc_detl a
+ left join asr_loc_mast b on a.loc_no = b.loc_no
+ where 1=1
+ and b.loc_sts = 'F'
+ and a.matnr = #{matnr}
+ <if test="orderNo != null and orderNo != ''">
+ and a.order_no = #{orderNo}
+ </if>
+
+ <include refid="batchSeq123"></include>
+
+
+ <if test="locNos != null and locNos.size > 0">
+ and b.loc_no not in
+ <foreach item="item" collection="locNos" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </if>
+
+ order by
+ DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
+ desc,
+ NEWID(),
+ case
+ when (left(a.loc_no, 2) = '01') then 0
+ when (left(a.loc_no, 2) = '02') then 1
+ when (left(a.loc_no, 2) = '03') then 1
+ when (left(a.loc_no, 2) = '04') then 0
+ when (left(a.loc_no, 2) = '05') then 0
+ when (left(a.loc_no, 2) = '06') then 1
+ when (left(a.loc_no, 2) = '07') then 1
+ when (left(a.loc_no, 2) = '08') then 0
+ when (left(a.loc_no, 2) = '09') then 0
+ when (left(a.loc_no, 2) = '10') then 1
+ when (left(a.loc_no, 2) = '11') then 1
+ when (left(a.loc_no, 2) = '12') then 0
+ when (left(a.loc_no, 2) = '13') then 0
+ when (left(a.loc_no, 2) = '14') then 1
+ when (left(a.loc_no, 2) = '15') then 1
+ when (left(a.loc_no, 2) = '16') then 0
+ when (left(a.loc_no, 2) = '17') then 0
+ when (left(a.loc_no, 2) = '18') then 1
+ when (left(a.loc_no, 2) = '19') then 1
+ when (left(a.loc_no, 2) = '20') then 0
+ when (left(a.loc_no, 2) = '21') then 0
+ when (left(a.loc_no, 2) = '22') then 1
+ when (left(a.loc_no, 2) = '23') then 1
+ when (left(a.loc_no, 2) = '24') then 0
+ when (left(a.loc_no, 2) = '25') then 0
+ when (left(a.loc_no, 2) = '26') then 1
+ when (left(a.loc_no, 2) = '27') then 1
+ when (left(a.loc_no, 2) = '28') then 0
+ when (left(a.loc_no, 2) = '29') then 0
+ when (left(a.loc_no, 2) = '30') then 1
+ when (left(a.loc_no, 2) = '31') then 1
+ when (left(a.loc_no, 2) = '32') then 0
+ when (left(a.loc_no, 2) = '33') then 0
+ when (left(a.loc_no, 2) = '34') then 1
+ when (left(a.loc_no, 2) = '35') then 1
+ when (left(a.loc_no, 2) = '36') then 0
+ when (left(a.loc_no, 2) = '37') then 0
+ when (left(a.loc_no, 2) = '38') then 1
+ when (left(a.loc_no, 2) = '39') then 1
+ when (left(a.loc_no, 2) = '40') then 0
+ when (left(a.loc_no, 2) = '41') then 0
+ when (left(a.loc_no, 2) = '42') then 1
+ when (left(a.loc_no, 2) = '43') then 1
+ when (left(a.loc_no, 2) = '44') then 0
+ when (left(a.loc_no, 2) = '45') then 0
+ when (left(a.loc_no, 2) = '46') then 1
+ when (left(a.loc_no, 2) = '47') then 1
+ when (left(a.loc_no, 2) = '48') then 0
+ else 0
+ end
+ desc
+ </select>
+
<select id="queryStockAnfme" resultType="java.lang.Double">
select sum(anfme) as count from man_loc_detl
where 1=1
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index f6656d4..27ef995 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -43,7 +43,7 @@
cols: [[
{type: 'numbers'},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
- {field: 'itemName', align: 'center', title: '瀹㈡埛po', minWidth: 160, width: 160},
+ // {field: 'itemName', align: 'center', title: '瀹㈡埛po', minWidth: 160, width: 160},
{field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
{field: 'cstmrName', align: 'center', title: '璐т富', minWidth: 160, width: 160},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
--
Gitblit v1.9.1