| src/main/java/com/zy/asrs/entity/BasBoxType.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/WrkMastSta.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/common/service/CommonService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/BasBoxTypeMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/entity/BasBoxType.java
@@ -36,6 +36,13 @@ @TableField("box_type") private String boxType; /** * 堆垛机 */ @ApiModelProperty(value= "箱型编号") @TableField("arm_type") private int armType; public BasBoxType() {} public BasBoxType(String boxSpecs,String boxType) { src/main/java/com/zy/asrs/entity/WrkMastSta.java
@@ -207,6 +207,14 @@ case 112: case 115: return souSta + 1; case 1901: case 1902: case 1904: case 1905: case 1906: case 1907: case 1908: return 122; default: return souSta; } src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1371,7 +1371,7 @@ public List<Map<String, Object>> boxTypeComb2() { EntityWrapper<BasBoxType> wrapper = new EntityWrapper<>(); List<Map<String, Object>> result = new ArrayList<>(); List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(wrapper.orderBy("id",true)); List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(wrapper.orderBy("id",true).eq("arm_type",999)); for (BasBoxType basBoxType : basBoxTypes){ Map<String, Object> map = new HashMap<>(); map.put("boxType", basBoxType.getBoxType()); src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java
@@ -61,7 +61,7 @@ }}; public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{ add(120);add(121);add(122);add(123);add(171); add(120);add(121);add(123);add(171); }}; @@ -154,7 +154,7 @@ } } }catch (Exception e){ log.error("自动补空板STA_WORK_RU处理失败，当前站点号："+staNo+"异常信息"+e); log.error("STA_WORK_RU处理失败，当前站点号："+staNo+"异常信息"+e); } } } src/main/java/com/zy/asrs/task/WrkMastStaInIt3Scheduler.java
@@ -60,7 +60,7 @@ }}; public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{ add(118);add(122); add(118);add(122);add(1907); }}; @@ -91,7 +91,7 @@ continue; } if (wrkMast.getIoType()<100 || wrkMast.getIoType()==110){ if (!wrkMast.getStaNo().equals(122)){ if (!wrkMast.getStaNo().equals(122) && !wrkMast.getStaNo().equals(1901)){ continue; } } @@ -101,7 +101,8 @@ if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119 || wrkMast.getStaNo()==120 || wrkMast.getStaNo()==121){ continue; } boolean wrkTypeSign = fullKM(wrkMast); // boolean wrkTypeSign = fullKM(wrkMast); boolean wrkTypeSign = true; if (!Cools.isEmpty(wrkMast)){ if (wrkTypeSign) { ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3：取放 @@ -134,8 +135,14 @@ continue; } if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){ continue; if (staNo==1907){ if (wrkMast.getWrkSts()!=2){ continue; } } else { if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){ continue; } } // boolean wrkTypeSign = fullKM(wrkMast); @@ -150,7 +157,7 @@ } } }catch (Exception e){ log.error("自动补空板STA_WORK_RU处理失败，当前站点号："+staNo+"异常信息"+e); log.error("STA_WORK_RU处理失败，当前站点号："+staNo+"异常信息"+e); } } } src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -61,7 +61,7 @@ }}; public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{ add(118);add(120);add(121);add(122);add(123); add(118);add(120);add(121);add(122);add(123);add(1907); }}; // add(171); @@ -98,7 +98,7 @@ continue; } if (wrkMast.getIoType()<100 || wrkMast.getIoType()==110){ if (!wrkMast.getStaNo().equals(122)){ if (!wrkMast.getStaNo().equals(122) && !wrkMast.getStaNo().equals(1901)){ continue; } } @@ -108,13 +108,14 @@ if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119 || wrkMast.getStaNo()==120 || wrkMast.getStaNo()==121){ continue; } boolean wrkTypeSign = fullKM(wrkMast); // boolean wrkTypeSign = fullKM(wrkMast); boolean wrkTypeSign = true; if (!Cools.isEmpty(wrkMast)){ if (wrkTypeSign) { ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3：取放 if (result.getCode()==200){ continue; }else { } else { System.out.println(staNo+"失败！"); } } else { @@ -140,9 +141,14 @@ if (Cools.isEmpty(wrkMast)){ continue; } if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){ continue; if (staNo==1907){ if (wrkMast.getWrkSts()!=2){ continue; } } else { if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){ continue; } } // boolean wrkTypeSign = fullKM(wrkMast); @@ -157,7 +163,7 @@ } } }catch (Exception e){ log.error("自动补空板STA_WORK_RU处理失败，当前站点号："+staNo+"异常信息"+e); log.error("STA_WORK_RU处理失败，当前站点号："+staNo+"异常信息"+e); } } } src/main/java/com/zy/common/service/CommonService.java
@@ -160,7 +160,7 @@ throw new CoolException("数据异常，请联系管理员"); } // ===============>>>> 开始执行 if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901){ if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901 || sourceStaNo == 1908){ curRow = rowLastno.getCurrentRow1(); } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){ curRow = rowLastno.getCurrentRow2(); @@ -230,7 +230,7 @@ if (locMast2.getCrnNo()==1 || locMast2.getCrnNo()==6){ continue; } if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901){ if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901 || sourceStaNo == 1908){ if (locMast2.getCrnNo()>3){ continue; } @@ -262,7 +262,7 @@ if (shallowLoc.getCrnNo()==1 || shallowLoc.getCrnNo()==6){ continue; } if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901){ if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901 || sourceStaNo == 1908){ if (shallowLoc.getCrnNo()>3){ continue; } @@ -355,7 +355,7 @@ // 更新库位排号 if (Utils.BooleanWhsTypeSta(whsType, staDescId) && Cools.isEmpty(locMast)) { if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901){ if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901 || sourceStaNo == 1908){ rowLastno.setCurrentRow1(curRow); } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){ rowLastno.setCurrentRow2(curRow); @@ -491,7 +491,7 @@ throw new CoolException("数据异常，请联系管理员"); } // ===============>>>> 开始执行 if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901){ if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901 || sourceStaNo == 1908){ curRow = rowLastno.getCurrentRow1(); } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){ curRow = rowLastno.getCurrentRow2(); @@ -671,7 +671,7 @@ // 更新库位排号 if (Utils.BooleanWhsTypeSta(whsType, staDescId) && Cools.isEmpty(locMast)) { if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901){ if (sourceStaNo == 118 || sourceStaNo == 122 || sourceStaNo == 1901 || sourceStaNo == 1908){ rowLastno.setCurrentRow1(curRow); } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){ rowLastno.setCurrentRow2(curRow); src/main/resources/mapper/BasBoxTypeMapper.xml
@@ -7,6 +7,7 @@ <id column="id" property="id" /> <result column="box_specs" property="boxSpecs" /> <result column="box_type" property="boxType" /> <result column="arm_type" property="armType" /> </resultMap>
