license.lic

Binary files differ

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -133,10 +133,9 @@
            }
            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                    .eq("loc_sts", "F")
                    .eq("loc_no", locNo)
                    .eq("barcode", param.getBarcode()));
                    .eq("loc_no", locNo));
            if(Cools.isEmpty(locMast)){
                result = R.error("该库位不满足出库条件" + locMast.getLocNo());
                result = R.error("该库位不满足出库条件" + locNo);
                return result;
            }


 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -198,15 +198,16 @@
                                    .build()
                                    .doPost();
                            JSONObject jsonObject = JSON.parseObject(response);
                            log.info(response);
                            redisUtil.set(RedisKeyType.IN_TASK_LOCK.key + inSta.getStaNo(), "lock", 5);
                            if (jsonObject.getInteger("code") == 200) {

                            } else if (jsonObject.getInteger("code") == 500) {
                                News.watchInfo(String.valueOf(staProtocol.getSiteId()), "条码：" + barcode + "申请WMS失败,系统回退,response=" + JSON.toJSONString(jsonObject));

                                staProtocol.setWorkNo(9997);
                                staProtocol.setStaNo(inSta.getBackSta().shortValue());
                                MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
//                                staProtocol.setWorkNo(9997);
//                                staProtocol.setStaNo(inSta.getBackSta().shortValue());
//                                MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                                continue;
                            }else {
                                News.watchInfo(String.valueOf(staProtocol.getSiteId()), "条码：" + barcode + "申请WMS失败,response=" + JSON.toJSONString(jsonObject));
@@ -248,7 +249,7 @@
                            taskWrk.setBarcode(barcode);//条码
                            taskWrk.setCrnNo(locMast.getCrnNo());
                            taskWrk.setTargetPoint(resultLocNo);
                            taskWrk.setStartPoint(String.valueOf(staProtocol.getStaNo()));
                            taskWrk.setStartPoint(String.valueOf(inSta.getStaNo()));
                            if (!Cools.isEmpty(taskWrk.getTargetPoint())) {
                                taskWrk.setOriginTargetPoint(taskWrk.getTargetPoint());
                            }
@@ -456,7 +457,7 @@
                    flag = true;
                }
                if (!flag) {
                    News.watchError(crnStn.getStaNo() + "站点", "入库 ===>> 堆垛机站点状态检测失败，站点需要满足：自动、有物、有工作号、站点可入");
//                    News.watchError(crnStn.getStaNo() + "站点", "入库 ===>> 堆垛机站点状态检测失败，站点需要满足：自动、有物、有工作号、站点可入");
                    continue;
                }


 src/main/java/com/zy/common/utils/HttpHandler.java

@@ -15,7 +15,7 @@
 */
public class HttpHandler {

    private static final Integer DEFAULT_TIMEOUT_SECONDS = 5;
    private static final Integer DEFAULT_TIMEOUT_SECONDS = 10;
    private static final MediaType MEDIA_TYPE = MediaType.parse("application/json");

    private String uri;

 src/main/resources/application-prod.yml

@@ -191,7 +191,7 @@
    rack: 0
    ip: 192.168.10.110
    outSta[3]: #出库口4
      staNo: 103
      staNo: 104
    emptyInSta[7]: #空板入库口8
      staNo: 212
    emptyInSta[5]: #空板入库口6
@@ -199,7 +199,7 @@
    emptyInSta[3]: #空板入库口4
      staNo: 108
    outSta[1]: #出库口2
      staNo: 101
      staNo: 102
    inSta[3]:
      staNo: 107
      backSta: 108