From 7ace63f8e1f245d78ea8c9635686cd08a43765bb Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期三, 19 六月 2024 12:59:20 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 48 ++- src/main/java/com/zy/asrs/controller/LocMastController.java | 31 +- src/main/resources/mapper/LocMastMapper.xml | 79 ++++- src/main/resources/mapper/WrkMastMapper.xml | 25 + src/main/java/com/zy/asrs/utils/DigitAndSortUrils.java | 24 + src/main/java/com/zy/asrs/service/WrkMastService.java | 3 src/main/java/com/zy/asrs/utils/Utils.java | 83 +++++- src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 4 src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 16 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 3 src/main/java/com/zy/asrs/service/LocMastService.java | 10 src/main/java/com/zy/common/service/CommonService.java | 444 +++++++++++++++++++++++++++++++++ src/main/webapp/static/image/logo.png | 0 13 files changed, 680 insertions(+), 90 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java index 56cda69..2eae903 100644 --- a/src/main/java/com/zy/asrs/controller/LocMastController.java +++ b/src/main/java/com/zy/asrs/controller/LocMastController.java @@ -193,27 +193,24 @@ String locNo = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l); // 鑾峰彇鍫嗗灈鏈哄彿 int crnNo = 0; - if (basWhs.getIdentifying().equals("1") || basWhs.getIdentifying().equals("3")){ - try{ - Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount(),param.getStartRow()); - for (List<Integer> node : shelves.nodes){ + try{ + Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount(),param.getStartRow()); + for (List<Integer> node : shelves.nodes){ - if (node.contains(r)) { - if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0){ - crnNo = shelves.nodes.indexOf(node) + param.getStaCrn(); - }else { - crnNo = shelves.nodes.indexOf(node) + 1; - } - - break; + if (node.contains(r)) { + if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0){ + crnNo = shelves.nodes.indexOf(node) + param.getStaCrn(); + }else { + crnNo = shelves.nodes.indexOf(node) + 1; } + + break; } - }catch (Exception e){ - throw new Exception("瑙f瀽鍫嗗灈鏈哄彿澶辫触锛岃濉啓姝g‘鐨勬暟鎹�!!!"); } - }else { - crnNo = param.getStaCrn(); + }catch (Exception e){ + throw new Exception("瑙f瀽鍫嗗灈鏈哄彿澶辫触锛岃濉啓姝g‘鐨勬暟鎹�!!!"); } + Date now = new Date(); LocMast locMast = new LocMast(); locMast.setLocNo(locNo); @@ -221,7 +218,7 @@ locMast.setRow1(r); // 鎺� locMast.setBay1(b); // 鍒� locMast.setLev1(l); // 灞� - locMast.setGro1(0); // 缁� + locMast.setGro1(r); // 缁� locMast.setCrnNo(crnNo); // 鍫嗗灈鏈� locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1); locMast.setLocType2(param.getLocType2()); diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java index 75d8b21..14567e7 100644 --- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java +++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java @@ -29,20 +29,28 @@ /* * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣� 娣�>娴� * */ - LocMast selectLocByLocStsPakInF1(@Param("locNos") List<String> locNos,@Param("whsType") Long whsType); +// LocMast selectLocByLocStsPakInF1(@Param("locNos") List<String> locNos,@Param("whsType") Long whsType); + + LocMast selectLocByLocStsPakInF1(@Param("crnNo") Integer crnNo,@Param("bay") Integer bay,@Param("lev") Integer lev,@Param("gro") Integer gro,@Param("whsType") Long whsType); /* * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣� 娣�<娴� * */ - LocMast selectLocByLocStsPakInF2(@Param("locNos") List<String> locNos,@Param("whsType") Long whsType); +// LocMast selectLocByLocStsPakInF2(@Param("locNos") List<String> locNos,@Param("whsType") Long whsType); + + LocMast selectLocByLocStsPakInF2(@Param("crnNo") Integer crnNo,@Param("bay") Integer bay,@Param("lev") Integer lev,@Param("gro") Integer gro,@Param("whsType") Long whsType); /* * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅 娣�>娴� * */ - LocMast selectLocByLocStsPakInO1(@Param("locNos") List<String> locNos,@Param("whsType") Long whsType); +// LocMast selectLocByLocStsPakInO1(@Param("locNos") List<String> locNos,@Param("whsType") Long whsType); + + LocMast selectLocByLocStsPakInO1(@Param("crnNo") Integer crnNo,@Param("bay") Integer bay,@Param("lev") Integer lev,@Param("gro") Integer gro,@Param("whsType") Long whsType); /* * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅 娣�<娴� * */ - LocMast selectLocByLocStsPakInO2(@Param("locNos") List<String> locNos,@Param("whsType") Long whsType); +// LocMast selectLocByLocStsPakInO2(@Param("locNos") List<String> locNos,@Param("whsType") Long whsType); + + LocMast selectLocByLocStsPakInO2(@Param("crnNo") Integer crnNo,@Param("bay") Integer bay,@Param("lev") Integer lev,@Param("gro") Integer gro,@Param("whsType") Long whsType); } diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java index 2fefe09..e1a363b 100644 --- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java +++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper; import com.zy.asrs.entity.WrkMast; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; @@ -20,4 +21,6 @@ @Select("select count(1) from asr_wrk_mast where 1=1 and io_type = #{ioType} and sta_no = #{staNo}") int selectWrkMastBareBoardStaNo(Integer ioType,Integer staNo); + List<WrkMast> selectWrkMastWrkDetlMatnrBatch(@Param("ioType") Integer ioType, @Param("matnr") String matnr , @Param("batch") String batch , @Param("grade") String grade , @Param("crnNo") Integer crnNo); + } diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java index 91a2d47..0a66cd6 100644 --- a/src/main/java/com/zy/asrs/service/LocMastService.java +++ b/src/main/java/com/zy/asrs/service/LocMastService.java @@ -50,12 +50,14 @@ /* * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣� * */ - LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos); - LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos, Long whsType); +// LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos); +// LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos, Long whsType); + LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,LocMast locNo, Long whsType); /* * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅 * */ - LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos); - LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos, Long whsType); +// LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos); +// LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos, Long whsType); + LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,LocMast locNoo, Long whsType); } diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java index 2d4b5b9..481b521 100644 --- a/src/main/java/com/zy/asrs/service/WrkMastService.java +++ b/src/main/java/com/zy/asrs/service/WrkMastService.java @@ -23,4 +23,7 @@ int getStoreCount(Integer crnNo); int selectWrkMastBareBoardStaNo(Integer ioType,Integer staNo); + + List<WrkMast> selectWrkMastWrkDetlMatnrBatch(Integer ioType,String matnr , String batch ,String grade,Integer crnNo); + } diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java index 4f5c4a4..2db40bd 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java @@ -71,38 +71,46 @@ /* *鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣� * */ - @Override - public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos) { - if (curRow<nearRow){ - return this.baseMapper.selectLocByLocStsPakInF1(locNos,1L); - } - return this.baseMapper.selectLocByLocStsPakInF2(locNos,1L); - } +// @Override +// public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos) { +// if (curRow<nearRow){ +// return this.baseMapper.selectLocByLocStsPakInF1(locNos,1L); +// } +// return this.baseMapper.selectLocByLocStsPakInF2(locNos,1L); +// } +// +// @Override +// public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos,Long type) { +// if (curRow<nearRow){ +// return this.baseMapper.selectLocByLocStsPakInF1(locNos,type); +// } +// return this.baseMapper.selectLocByLocStsPakInF2(locNos,type); +// } @Override - public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos,Long type) { + public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,LocMast locMast,Long type) { if (curRow<nearRow){ - return this.baseMapper.selectLocByLocStsPakInF1(locNos,type); + return this.baseMapper.selectLocByLocStsPakInF1(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type); } - return this.baseMapper.selectLocByLocStsPakInF2(locNos,type); + return this.baseMapper.selectLocByLocStsPakInF2(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type); } /* * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅 * */ +// @Override +// public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos) { +// if (curRow<nearRow){ +// return this.baseMapper.selectLocByLocStsPakInO1(locNos,1L); +// } +// return this.baseMapper.selectLocByLocStsPakInO2(locNos,1L); +// } @Override - public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos) { + public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,LocMast locMast,Long type) { if (curRow<nearRow){ - return this.baseMapper.selectLocByLocStsPakInO1(locNos,1L); + return this.baseMapper.selectLocByLocStsPakInO1(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type); } - return this.baseMapper.selectLocByLocStsPakInO2(locNos,1L); - } - @Override - public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos,Long type) { - if (curRow<nearRow){ - return this.baseMapper.selectLocByLocStsPakInO1(locNos,type); - } - return this.baseMapper.selectLocByLocStsPakInO2(locNos,type); + return this.baseMapper.selectLocByLocStsPakInO2(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type); } @Override diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java index 3b7144d..374f295 100644 --- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java @@ -50,4 +50,8 @@ return this.baseMapper.selectWrkMastBareBoardStaNo(ioType,staNo); } + @Override + public List<WrkMast> selectWrkMastWrkDetlMatnrBatch(Integer ioType,String matnr , String batch ,String grade ,Integer crnNo) { + return this.baseMapper.selectWrkMastWrkDetlMatnrBatch(ioType,matnr,batch,grade,crnNo); + } } diff --git a/src/main/java/com/zy/asrs/utils/DigitAndSortUrils.java b/src/main/java/com/zy/asrs/utils/DigitAndSortUrils.java new file mode 100644 index 0000000..35958da --- /dev/null +++ b/src/main/java/com/zy/asrs/utils/DigitAndSortUrils.java @@ -0,0 +1,24 @@ +package com.zy.asrs.utils; + +import java.util.Arrays; + +public class DigitAndSortUrils { + + public static void main(String[] args) { + int[] numbers = {5, 10, 15, 3, 8}; // 鍋囪杩欐槸浣犵殑涓�缁勬暟瀛� + + System.out.println(digitMax(numbers)+":max"); + System.out.println(digitMin(numbers)+":min"); + } + + public static Integer digitMax(int[] numbers) { + int max = Arrays.stream(numbers).max().getAsInt(); + return max; + } + + public static Integer digitMin(int[] numbers) { + int min = Arrays.stream(numbers).min().getAsInt(); + return min; + } + +} diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java index b4de45a..b2690ec 100644 --- a/src/main/java/com/zy/asrs/utils/Utils.java +++ b/src/main/java/com/zy/asrs/utils/Utils.java @@ -8,10 +8,12 @@ import com.zy.asrs.entity.LocMast; import com.zy.asrs.entity.RowLastno; import com.zy.asrs.service.RowLastnoService; +import com.zy.common.CodeBuilder; import com.zy.common.model.LocDetlDto; import com.zy.common.properties.SlaveProperties; import com.zy.common.service.CommonService; import com.zy.system.service.UserService; + import java.text.DecimalFormat; import java.util.ArrayList; @@ -254,26 +256,24 @@ return false; } - public static int RowCount(Integer whsType, Integer curRow, Integer crnNumber) { - return LocNecessaryParameters(whsType, curRow, crnNumber)[0]; + public static int RowCount(RowLastno rowLastno, Integer curRow, Integer crnNumber) { + return LocNecessaryParameters(rowLastno, curRow, crnNumber)[0]; } - public static int getCurRow(Integer whsType, Integer curRow, Integer crnNumber) { - return LocNecessaryParameters(whsType, curRow, crnNumber)[1]; + public static int getCurRow(RowLastno rowLastno, Integer curRow, Integer crnNumber) { + return LocNecessaryParameters(rowLastno, curRow, crnNumber)[1]; } - public static int getCrnNo(Integer whsType, Integer curRow, Integer crnNumber) { - return LocNecessaryParameters(whsType, curRow, crnNumber)[2]; + public static int getCrnNo(RowLastno rowLastno, Integer curRow, Integer crnNumber) { + return LocNecessaryParameters(rowLastno, curRow, crnNumber)[2]; } - public static int getNearRow(Integer whsType, Integer curRow, Integer crnNumber) { - return LocNecessaryParameters(whsType, curRow, crnNumber)[3]; + public static int getNearRow(RowLastno rowLastno, Integer curRow, Integer crnNumber) { + return LocNecessaryParameters(rowLastno, curRow, crnNumber)[3]; } //搴撲綅鎺掑彿鍒嗛厤 - public static int[] LocNecessaryParameters(Integer whsType, Integer curRow, Integer crnNumber) { - RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class); - RowLastno rowLastno = rowLastnoService.selectById(whsType); + public static int[] LocNecessaryParameters(RowLastno rowLastno, Integer curRow, Integer crnNumber) { switch (rowLastno.getTypeId()) { case 1://缁忓吀鍙屼几搴撲綅 return LocNecessaryParametersDoubleExtension(rowLastno, curRow, crnNumber); //宸插畬鍠� @@ -285,6 +285,8 @@ return LocNecessaryParametersDoubleExtension4(rowLastno, curRow, crnNumber); //鏈畬鍠� case 5://鍙屽伐浣嶅崟浼稿簱浣�(4鎺掕揣鏋�) return LocNecessaryParametersDoubleExtension5(rowLastno, curRow, crnNumber); //宸插畬鍠� + case 6://鍥涘悜搴�(鐗涚溂杞�)eg:鍏夋嘲鍥涘悜 + return LocNecessaryParametersDoubleExtension6(rowLastno, curRow, crnNumber); //宸插畬鍠� default: return LocNecessaryParametersMove(rowLastno, curRow, crnNumber);//moveCrnNo } @@ -417,8 +419,8 @@ //缁忓吀鍗曞弻浼稿簱浣� 宸﹀弻鍙冲崟(灏忓弻澶у崟) public static int[] LocNecessaryParametersDoubleExtension4(RowLastno rowLastno, Integer curRow, Integer crnNumber) { int[] necessaryParameters = new int[]{0, 0, 0, 0}; - Integer sRow = rowLastno.getsRow(); - Integer sCrnNo = rowLastno.getsCrnNo(); + Integer sRow = rowLastno.getsRow();//璧峰鎺掑彿 + Integer sCrnNo = rowLastno.getsCrnNo();//璧峰鍫嗗灈鏈哄彿 necessaryParameters[0] = crnNumber; // 杞娆℃暟 //婊℃澘姝e父鍏ュ簱 if (curRow.equals(crnNumber * 3 + sRow - 1)) { @@ -485,6 +487,53 @@ return necessaryParameters; } + //鍥涘悜搴擄紙鐗涚溂\鍏夋嘲锛� + public static int[] LocNecessaryParametersDoubleExtension6(RowLastno rowLastno, Integer curRow, Integer crnNumber) { + int[] necessaryParameters = new int[]{0, 0, 0, 0}; + Integer sRow = rowLastno.getsRow();//璧峰鎺掑彿 + Integer offset = 0;//璧峰鎺掑彿 + Integer sCrnNo = rowLastno.getsCrnNo();//璧峰鍫嗗灈鏈哄彿 + necessaryParameters[0] = crnNumber; // 杞娆℃暟 + curRow = curRow - offset; + //婊℃澘姝e父鍏ュ簱 + switch (curRow){ + case 2: + necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓 + necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 + necessaryParameters[3] = 7; //nearRow 鏈�娴呭簱浣嶆帓 + break; + case 7: + necessaryParameters[1] = 9; //curRow 鏈�娣卞簱浣嶆帓 + necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 + necessaryParameters[3] = 12; //nearRow 鏈�娴呭簱浣嶆帓 + break; + case 12: + necessaryParameters[1] = 7; //curRow 鏈�娣卞簱浣嶆帓 + necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 + necessaryParameters[3] = 4; //nearRow 鏈�娴呭簱浣嶆帓 + break; + case 4: + necessaryParameters[1] = 12; //curRow 鏈�娣卞簱浣嶆帓 + necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 + necessaryParameters[3] = 9; //nearRow 鏈�娴呭簱浣嶆帓 + break; + case 9: + necessaryParameters[1] = 14; //curRow 鏈�娣卞簱浣嶆帓 + necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 + necessaryParameters[3] = 14; //nearRow 鏈�娴呭簱浣嶆帓 + break; + case 14: + necessaryParameters[1] = 1; //curRow 鏈�娣卞簱浣嶆帓 + necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿 + necessaryParameters[3] = 2; //nearRow 鏈�娴呭簱浣嶆帓 + break; + default: + throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow); + } + necessaryParameters[1] = necessaryParameters[1] + offset; + necessaryParameters[3] = necessaryParameters[3] + offset; + return necessaryParameters; + } public static void main(String[] args) { @@ -548,12 +597,12 @@ // 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜 ===>> 鍙嶄箣 public static List<String> getGroupOutLocCrn(Integer curRow, Integer nearRow, String locNo, boolean pakin) { List<String> result = new ArrayList<>(); - if (pakin) { - for (int row = curRow; row <= nearRow; row++) { + if (pakin){ + for (int row = curRow;row>=nearRow;row--){ result.add(zerofill(String.valueOf(row), 2) + locNo.substring(2)); } - } else { - for (int row = curRow; row >= curRow; row--) { + }else { + for (int row = curRow;row<=nearRow;row++){ result.add(zerofill(String.valueOf(row), 2) + locNo.substring(2)); } } diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index b06416a..fac69f8 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -54,6 +54,8 @@ private LocDetlService locDetlService; @Autowired private SlaveProperties slaveProperties; + @Autowired + private WrkDetlService wrkDetlService; /** * 鐢熸垚宸ヤ綔鍙� @@ -137,7 +139,7 @@ log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo); break; case 4: - return getLocNoRun(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0); + return getLocNoRun2(whsType,staDescId,sourceStaNo,matnr,batch,grade,3,locTypeDto,0); case 5: log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo); break; @@ -182,14 +184,18 @@ StartupDto startupDto = new StartupDto(); RowLastno rowLastno = rowLastnoService.selectById(whsType); + if (Cools.isEmpty(rowLastno)) { + throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠$悊鍛�===>搴撲綅瑙勫垯鏈煡"); + } RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(rowLastno.getTypeId()); + if (Cools.isEmpty(rowLastnoType)) { + throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠$悊鍛�===銆嬪簱浣嶈鍒欑被鍨嬫湭鐭�"); + } int sRow = rowLastno.getsRow(); int eRow = rowLastno.geteRow(); int crnNumber = rowLastno.getCrnQty(); - if (Cools.isEmpty(rowLastno)) { - throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠$悊鍛�"); - } + // ===============>>>> 寮�濮嬫墽琛� curRow = rowLastno.getCurrentRow(); @@ -204,7 +210,7 @@ //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿 for (int i = times; i < crnNumber*2; i++) { - int[] locNecessaryParameters = Utils.LocNecessaryParameters(whsType, curRow, crnNumber); + int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber); curRow = locNecessaryParameters[1]; crnNo = locNecessaryParameters[2]; if (basCrnpService.checkSiteError(crnNo, true)) { @@ -251,14 +257,17 @@ .eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())); for (LocMast locMast1:locMasts){ //鑾峰彇宸烽亾 - List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow); +// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow); +// LocMast locMastGro = locMastService.selectById(wrkMast.getLocNo()); //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣� - LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,groupOutsideLocCrn,rowLastnoType.getType().longValue()); + LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMast1,rowLastnoType.getType().longValue()); if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")){ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMastF.getLocNo())); - if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr()) && batch.equals(Cools.isEmpty(locDetl.getBatch()) ? "" : locDetl.getBatch()) && grade.equals(Cools.isEmpty(locDetl.getBrand()) ? "" : locDetl.getBrand())) { - //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣� - locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,groupOutsideLocCrn,rowLastnoType.getType().longValue()); + if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr()) + && batch.equals(batch.isEmpty() ? "" : locDetl.getBatch()) + && grade.equals(grade.isEmpty() ? "" : locDetl.getBrand())) { + //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅 + locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue()); break; } } @@ -454,4 +463,419 @@ return startupDto; } + public StartupDto getLocNoRun2(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) { + if (Cools.isEmpty(matnr)) { //鐗╂枡鍙� + matnr = ""; + } + if (Cools.isEmpty(batch)) { //鎵规 + batch = ""; + } + if (Cools.isEmpty(grade)) { //澶囩敤 + grade = ""; + } + + // 鍒濆鍖栧弬鏁� + int crnNo = 0; //鍫嗗灈鏈哄彿 + int nearRow = 0; //鏈�娴呭簱浣嶆帓 + int curRow = 0; //鏈�娣卞簱浣嶆帓 + int rowCount = 0; //杞杞 + LocMast locMast = null; // 鐩爣搴撲綅 + + StartupDto startupDto = new StartupDto(); + RowLastno rowLastno = rowLastnoService.selectById(whsType); + if (Cools.isEmpty(rowLastno)) { + throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠$悊鍛�===>搴撲綅瑙勫垯鏈煡"); + } + RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(rowLastno.getTypeId()); + if (Cools.isEmpty(rowLastnoType)) { + throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠$悊鍛�===銆嬪簱浣嶈鍒欑被鍨嬫湭鐭�"); + } + int sRow = rowLastno.getsRow(); + int eRow = rowLastno.geteRow(); + int crnNumber = rowLastno.getCrnQty(); + + // ===============>>>> 寮�濮嬫墽琛� + curRow = rowLastno.getCurrentRow(); + + if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){ + crnNumber = moveCrnNo; +// if (times==0){ +// curRow = moveCrnNo*4-1; +// }else { +// curRow = moveCrnNo*4-2; +// } + } + + //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿 + for (int i = times; i < crnNumber*2; i++) { + int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber); + curRow = locNecessaryParameters[1]; + crnNo = locNecessaryParameters[2]; + if (basCrnpService.checkSiteError(crnNo, true)) { + rowCount = locNecessaryParameters[0]; + nearRow = locNecessaryParameters[3]; + List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>() + .eq("crn_no", crnNo).eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())); + if (locMasts.size()<=5){ + times++; + continue; + } + break; + } else { + times++; + } + } + if (crnNo == 0) { + throw new CoolException("鏃犲彲鐢ㄥ簱浣�"); + } + + + // 鐩镐技宸ヤ綔妗f --- 鍚屽ぉ鍚岃鏍肩墿鏂� + if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111) ) { + //鏌ヨ鐩镐技宸ヤ綔妗f + List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetlMatnrBatch(staDescId, matnr, batch,grade, crnNo); + int nearbay = 0; //鐩镐技宸ヤ綔妗f 鐩爣搴撲綅鍒� + int nearlev = 0; //鐩镐技宸ヤ綔妗f 鐩爣搴撲綅灞� + for (WrkMast wrkMast:wrkMasts){ + if (Cools.isEmpty(wrkMast.getLocNo())){ + continue; + } + //鐩爣鎺掍负鏈�澶栧眰鎺� + if (Utils.getRow(wrkMast.getLocNo())==nearRow){ + continue; + } + //璧峰绔欎笉涓�鑷� + if (!wrkMast.getSourceStaNo().equals(sourceStaNo)){ + continue; + } + //鐩稿悓鍒椼�佸眰杩囨护 + if (Utils.getBay(wrkMast.getLocNo())==nearbay && Utils.getLev(wrkMast.getLocNo())==nearlev){ + continue; + }else { + nearbay=Utils.getBay(wrkMast.getLocNo()); + nearlev=Utils.getLev(wrkMast.getLocNo()); + } + //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撳苟鎺掑簭 +// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow); + LocMast locMastGro = locMastService.selectById(wrkMast.getLocNo()); + + //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣� + LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMastGro,rowLastnoType.getType().longValue()); + + //鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣嶅瓨鍦�&&闈炴渶澶栦晶搴撲綅&&鍏ュ簱鐘舵�� + if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo())!=nearRow && (locMast2.getLocSts().equals("S") || locMast2.getLocSts().equals("Q"))){ + //鑾峰彇搴撳瓨鏄庣粏 + WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo())); + //鍒ゆ柇鍚岃鏍肩墿鏂� + if (!Cools.isEmpty(wrkDetl) && matnr.equals(wrkDetl.getMatnr()) + && batch.equals(batch.isEmpty() ? "":wrkDetl.getBatch()) + && grade.equals(grade.isEmpty()? "":wrkDetl.getBrand())){ + int row2=0; + if (Utils.getRow(locMast2.getLocNo())>nearRow){ + row2=Utils.getRow(locMast2.getLocNo())-1; + } else { + row2=Utils.getRow(locMast2.getLocNo())+1; + } + String targetLocNo = zerofill(String.valueOf(row2), 2) + locMast2.getLocNo().substring(2); + locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",targetLocNo)); + break; + } + } + } + + } + + // 鐩镐技宸ヤ綔妗� --- 绌烘墭 + if (Cools.isEmpty(locMast) && staDescId == 10) { + List<WrkMast> wrkMasts =wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type",10).eq("crn_no",crnNo).eq("whs_type",rowLastnoType.getType().longValue())); + int nearbay = 0; + int nearlev = 0; + for (WrkMast wrkMast:wrkMasts){ + if (Cools.isEmpty(wrkMast.getLocNo())){ + continue; + } + if (Utils.getRow(wrkMast.getLocNo())==nearRow){ + continue; + } + //璧峰绔欎笉涓�鑷� + if (!wrkMast.getSourceStaNo().equals(sourceStaNo)){ + continue; + } + if (Utils.getBay(wrkMast.getLocNo())==nearbay && Utils.getLev(wrkMast.getLocNo())==nearlev){ + continue; + }else { + nearbay=Utils.getBay(wrkMast.getLocNo()); + nearlev=Utils.getLev(wrkMast.getLocNo()); + } +// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow); + LocMast locMastGro = locMastService.selectById(wrkMast.getLocNo()); + + LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMastGro,rowLastnoType.getType().longValue()); + + if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo())!=nearRow && locMast2.getLocSts().equals("S")){ + int row2=0; + if (Utils.getRow(locMast2.getLocNo())>nearRow){ + row2=Utils.getRow(locMast2.getLocNo())-1; + }else { + row2=Utils.getRow(locMast2.getLocNo())+1; + } + String targetLocNo = zerofill(String.valueOf(row2), 2) + locMast2.getLocNo().substring(2); + locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",targetLocNo)); + break; + } + } + } + + boolean signRule1 = false; + boolean signRule2 = false; + + + if (Utils.BooleanWhsTypeStaIoType(rowLastno)){ + // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗� + if (!Cools.isEmpty(matnr) && staDescId == 1){ + signRule1 = true; + } + // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //浜掗�氱増 + if (!Cools.isEmpty(matnr) && staDescId == 1) { + signRule2 = true; + } + + if (!Cools.isEmpty(matnr) && (staDescId == 11 || staDescId == 111)) { + signRule1 = true; + } + } + + if (signRule1){ + if (nearRow!=curRow){ + List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>() + .eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())); + for (LocMast locMast1:locMasts){ + //鑾峰彇宸烽亾 +// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow); + //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣� + LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMast1,rowLastnoType.getType().longValue()); + if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")){ + LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMastF.getLocNo())); + if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr()) + && batch.equals(batch.isEmpty() ? "" : locDetl.getBatch()) + && grade.equals(grade.isEmpty() ? "" : locDetl.getBrand())) { + //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅 + locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue()); + break; + } + } + } + } + }else if (signRule2){ + List<String> locNos = locDetlService.getSameDetlToday(matnr, sRow, eRow); + for (String locNo : locNos) { + if (Utils.isShallowLoc(slaveProperties, locNo)) { + continue; + } + String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo); + // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣� + LocMast shallowLoc = locMastService.selectById(shallowLocNo); + if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) { + if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) { + if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) { + locMast = shallowLoc; + crnNo = locMast.getCrnNo(); + break; + } + } + } + } + } + + // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //鍒嗙鐗� + if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) { + List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O")); + for (LocMast locMast1:locMasts){ + //鑾峰彇宸烽亾 +// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow); + //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣� + LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMast1,rowLastnoType.getType().longValue()); + if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("D")){ + //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣� + locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue()); + break; + } + } + } + +// // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増 +// if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(whsType)) { +// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow)); +// if (locMasts.size() > 0) { +// for (LocMast loc : locMasts) { +// if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) { +// continue; +// } +// String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo()); +// // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣� +// LocMast shallowLoc = locMastService.selectById(shallowLocNo); +// if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) { +// if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) { +// if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) { +// locMast = shallowLoc; +// crnNo = locMast.getCrnNo(); +// break; +// } +// } +// } +// } +// } +// } + + Wrapper<StaDesc> wrapper = null; + StaDesc staDesc = null; + BasDevp staNo = null; + + if (Utils.BooleanWhsTypeSta(rowLastno, staDescId)) { + // 鑾峰彇鐩爣绔� + wrapper = new EntityWrapper<StaDesc>() + .eq("type_no", staDescId) + .eq("stn_no", sourceStaNo) + .eq("crn_no", crnNo); + staDesc = staDescService.selectOne(wrapper); + if (Cools.isEmpty(staDesc)) { + log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo); +// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�"); + crnNo = 0; + }else { + staNo = basDevpService.selectById(staDesc.getCrnStn()); + if (!staNo.getAutoing().equals("Y")) { + log.error("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�"); +// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�"); + crnNo = 0; + } + startupDto.setStaNo(staNo.getDevNo()); + } + } + + // 鏇存柊搴撲綅鎺掑彿 + if (Utils.BooleanWhsTypeSta(rowLastno, staDescId) && Cools.isEmpty(locMast)) { + rowLastno.setCurrentRow(curRow); + rowLastnoService.updateById(rowLastno); + } + + // 寮�濮嬫煡鎵惧簱浣� ==============================>> + + // 1.鎸夎鍒欐煡鎵惧簱浣� + if (Cools.isEmpty(locMast) && crnNo != 0) { + List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>() + .eq("row1", nearRow) + .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue()) + .orderBy("lev1",true).orderBy("bay1",true));//鏈�娴呭簱浣� + for (LocMast locMast1 : locMasts) { + if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) { + continue; + } + if (Utils.BooleanWhsTypeStaIoType(rowLastno)){ +// String shallowLoc = Utils.getDeepLocYTl(slaveProperties, locMast1.getLocNo()); +// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>() +// .eq("loc_no", shallowLoc).eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())); + //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅 + LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue()); + if (!Cools.isEmpty(locMast2) && locMast2.getBay1()==curRow) { + locMast = locMast2; + break; + } + + } + } + + //鏈壘鍒� 鍏佽娣锋枡 + if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)){ + for (LocMast locMast1 : locMasts) { + if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) { + continue; + } + if (Utils.BooleanWhsTypeStaIoType(rowLastno)){ + //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撳苟鎺掑簭 +// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow); + + //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣� + LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMast1,rowLastnoType.getType().longValue()); + if (Cools.isEmpty(locMast2)) { + LocMast locMast3 = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue()); + if (!Cools.isEmpty(locMast3)) { + locMast = locMast3; + break; + } + } else { + if ((locMast2.getLocSts().equals("F") && staDescId == 1) || (locMast2.getLocSts().equals("D") && staDescId == 10)){ + LocMast locMast3 = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue()); + if (!Cools.isEmpty(locMast3)) { + locMast = locMast3; + break; + } + } + } + } + } + } + +// //鏈壘鍒� 鎵剧涓�鎺� +// if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)){ +// locMasts = locMastService.selectList(new EntityWrapper<LocMast>() +// .eq("row1", 1) +// .eq("loc_sts", "O") +// .orderBy("lev1",true).orderBy("bay1",true)); +// for (LocMast locMast1 : locMasts) { +// if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) { +// continue; +// } +// locMast = locMast1; +// break; +// } +// } + } + + if (!Cools.isEmpty(locMast) && !basCrnpService.checkSiteError(crnNo, true)) { + locMast = null; + } + + // 閫掑綊鏌ヨ + if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) { + // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊 + if (times < rowCount*2) { + times = times + 1; + return getLocNoRun(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times); + } +// // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣� +// if (locTypeDto.getLocType1() < 2) { +// int i = locTypeDto.getLocType1() + 1; +// locTypeDto.setLocType1((short)i); +// return getLocNo(1, staDescId, sourceStaNo, matnr,batch,grade, locTypeDto, 0); +// } + log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times); + throw new CoolException("娌℃湁绌哄簱浣�"); + } + String locNo = locMast.getLocNo(); + + // 鐢熸垚宸ヤ綔鍙� + int workNo = getWorkNo(0); + // 杩斿洖dto + startupDto.setWorkNo(workNo); + startupDto.setCrnNo(crnNo); + startupDto.setSourceStaNo(sourceStaNo); + startupDto.setLocNo(locNo); + return startupDto; + } + + public static String zerofill(String msg, Integer count) { + if (msg.length() == count) { + return msg; + } else if (msg.length() > count) { + return msg.substring(0, 16); + } else { + StringBuilder msgBuilder = new StringBuilder(msg); + for(int i = 0; i < count - msg.length(); ++i) { + msgBuilder.insert(0, "0"); + } + return msgBuilder.toString(); + } + } + } diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml index 982dd31..8d918ad 100644 --- a/src/main/resources/mapper/LocMastMapper.xml +++ b/src/main/resources/mapper/LocMastMapper.xml @@ -102,51 +102,94 @@ order by row1 desc </select> +<!-- <select id="selectLocByLocStsPakInF1" resultMap="BaseResultMap">--> +<!-- SELECT top 1 *--> +<!-- FROM [dbo].[asr_loc_mast]--> +<!-- WHERE 1=1--> +<!-- and whs_type=#{whsType}--> +<!-- and loc_no in--> +<!-- <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">--> +<!-- #{locNo}--> +<!-- </foreach>--> +<!-- AND loc_sts not in ('O') order by row1--> +<!-- </select>--> + <select id="selectLocByLocStsPakInF1" resultMap="BaseResultMap"> SELECT top 1 * FROM [dbo].[asr_loc_mast] WHERE 1=1 and whs_type=#{whsType} - and loc_no in - <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=","> - #{locNo} - </foreach> + and crn_no=#{crnNo} + and bay1 = #{bay} + and lev1 = #{lev} + and gro1 = #{gro} AND loc_sts not in ('O') order by row1 </select> +<!-- <select id="selectLocByLocStsPakInF2" resultMap="BaseResultMap">--> +<!-- SELECT top 1 *--> +<!-- FROM [dbo].[asr_loc_mast]--> +<!-- WHERE 1=1--> +<!-- and whs_type=#{whsType}--> +<!-- and loc_no in--> +<!-- <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">--> +<!-- #{locNo}--> +<!-- </foreach>--> +<!-- AND loc_sts not in ('O') order by row1 desc--> +<!-- </select>--> <select id="selectLocByLocStsPakInF2" resultMap="BaseResultMap"> SELECT top 1 * FROM [dbo].[asr_loc_mast] WHERE 1=1 and whs_type=#{whsType} - and loc_no in - <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=","> - #{locNo} - </foreach> + and crn_no=#{crnNo} + and bay1 = #{bay} + and lev1 = #{lev} + and gro1 = #{gro} AND loc_sts not in ('O') order by row1 desc </select> - +<!-- <select id="selectLocByLocStsPakInO1" resultMap="BaseResultMap">--> +<!-- SELECT top 1 *--> +<!-- FROM [dbo].[asr_loc_mast]--> +<!-- WHERE 1=1--> +<!-- and whs_type=#{whsType}--> +<!-- and loc_no in--> +<!-- <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">--> +<!-- #{locNo}--> +<!-- </foreach>--> +<!-- AND loc_sts in ('O') order by row1 desc--> +<!-- </select>--> <select id="selectLocByLocStsPakInO1" resultMap="BaseResultMap"> SELECT top 1 * FROM [dbo].[asr_loc_mast] WHERE 1=1 and whs_type=#{whsType} - and loc_no in - <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=","> - #{locNo} - </foreach> + and crn_no=#{crnNo} + and bay1 = #{bay} + and lev1 = #{lev} + and gro1 = #{gro} AND loc_sts in ('O') order by row1 desc </select> - +<!-- <select id="selectLocByLocStsPakInO2" resultMap="BaseResultMap">--> +<!-- SELECT top 1 *--> +<!-- FROM [dbo].[asr_loc_mast]--> +<!-- WHERE 1=1--> +<!-- and whs_type=#{whsType}--> +<!-- and loc_no in--> +<!-- <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">--> +<!-- #{locNo}--> +<!-- </foreach>--> +<!-- AND loc_sts in ('O') order by row1--> +<!-- </select>--> <select id="selectLocByLocStsPakInO2" resultMap="BaseResultMap"> SELECT top 1 * FROM [dbo].[asr_loc_mast] WHERE 1=1 and whs_type=#{whsType} - and loc_no in - <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=","> - #{locNo} - </foreach> + and crn_no=#{crnNo} + and bay1 = #{bay} + and lev1 = #{lev} + and gro1 = #{gro} AND loc_sts in ('O') order by row1 </select> diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml index ce04079..e49e71f 100644 --- a/src/main/resources/mapper/WrkMastMapper.xml +++ b/src/main/resources/mapper/WrkMastMapper.xml @@ -75,4 +75,29 @@ order by io_time,wrk_no asc </select> + <select id="selectWrkMastWrkDetlMatnrBatch" resultMap="BaseResultMap"> + select m.* from asr_wrk_mast m,asr_wrk_detl d + where 1=1 + and m.wrk_no = d.wrk_no + and m.io_type = #{ioType} + and m.crn_no = #{crnNo} + and d.matnr = #{matnr} + <choose> + <when test="batch != null and batch != ''"> + and d.batch = #{batch} + </when> + <otherwise> + and (d.batch IS NULL OR d.batch = '') + </otherwise> + </choose> + <choose> + <when test="grade != null and grade != ''"> + and d.brand = #{grade} + </when> + <otherwise> + and (d.brand IS NULL OR d.brand = '') + </otherwise> + </choose> + </select> + </mapper> diff --git a/src/main/webapp/static/image/logo.png b/src/main/webapp/static/image/logo.png index e2fc662..231c97e 100644 --- a/src/main/webapp/static/image/logo.png +++ b/src/main/webapp/static/image/logo.png Binary files differ -- Gitblit v1.9.1