#

18516761980

2022-09-30 aecd3f3e4e63770d2e23d1db2b63ab47d6dee5f1

#

 src/main/java/com/zy/asrs/entity/param/CombParam.java

@@ -31,7 +31,7 @@
    private String barcode;

    // 库位编号
    private String locno;
    private String locNo;

    private List<CombMat> combMats;


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

@@ -213,10 +213,10 @@
    @Override
    public void onSale(CombParam param) {
        // 获取库位号
        String locno = param.getLocno();
        Node node = nodeService.selectByUuid(locno);
        String locNo = param.getLocNo();
        Node node = nodeService.selectByUuid(locNo);
        if (Cools.isEmpty(node)) {
            throw new CoolException(param.getLocno() + ":库位不存在");
            throw new CoolException(param.getLocNo() + ":库位不存在");
        }

        // 获取商品列表
@@ -232,7 +232,7 @@
                throw new CoolException(combMat.getMatnr() + ":商品批号有误！");
            }
            ManLocDetl manLocDetl = new ManLocDetl();
            manLocDetl.setLocNo(locno);
            manLocDetl.setLocNo(locNo);
            manLocDetl.setNodeId(node.getId());
            manLocDetl.setMatnr(combMat.getMatnr());
            manLocDetl.setBatch(combMat.getBatch());
@@ -644,7 +644,7 @@

        CombParam combParam = new CombParam();
        combParam.setPackNo(locMast.getBarcode());
        combParam.setLocno(locMast.getLocNo());
        combParam.setLocNo(locMast.getLocNo());
        combParam.setPackSts(1);
        combParam.setRequestTime(DateUtils.convert(new Date()));
        postMesData(inpath,combParam);
@@ -667,7 +667,7 @@
            CombParam combParam = new CombParam();
            combParam.setPackNo(testMast.getLocNo());
            combParam.setPackName(testMast.getUserId());
            combParam.setLocno(testMast.getBarcode());
            combParam.setLocNo(testMast.getBarcode());
            combParam.setRequestTime(DateUtils.convert(new Date()));
            return postMesData(startUpTestPACK,combParam);
        }catch (Exception e) {

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

@@ -703,7 +703,7 @@
                    locMast.setPackStatus(5); //5:静置完成
                    CombParam combParam = new CombParam();
                    combParam.setPackNo(locMast.getBarcode());
                    combParam.setLocno(locMast.getLocNo());
                    combParam.setLocNo(locMast.getLocNo());
                    combParam.setPackSts(6);
                    combParam.setRequestTime(DateUtils.convert(new Date()));
                    postMesData(inpath,combParam);
@@ -745,7 +745,7 @@
                locMast.setPackStatus(2);
                CombParam combParam = new CombParam();
                combParam.setPackNo(locMast.getBarcode());
                combParam.setLocno(locMast.getLocNo());
                combParam.setLocNo(locMast.getLocNo());
                combParam.setPackSts(2);
                combParam.setRequestTime(DateUtils.convert(new Date()));
                postMesData(inpath,combParam);
@@ -790,7 +790,7 @@
                testMast.setModiTime(date);
                CombParam combParam = new CombParam();
                combParam.setPackNo(locMast.getBarcode());
                combParam.setLocno(locMast.getLocNo());
                combParam.setLocNo(locMast.getLocNo());
                combParam.setPackSts(3);
                combParam.setRequestTime(DateUtils.convert(new Date()));
                postMesData(inpath,combParam);

 src/main/java/com/zy/asrs/task/handler/StandingHandler.java

@@ -119,7 +119,7 @@

                        CombParam combParam = new CombParam();
                        combParam.setPackNo(locMast.getBarcode());
                        combParam.setLocno(locMast.getLocNo());
                        combParam.setLocNo(locMast.getLocNo());
                        combParam.setPackSts(6);
                        combParam.setRequestTime(DateUtils.convert(new Date()));
                        postMesData(inpath,combParam);

 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -65,8 +65,8 @@
                if(wrkDetl != null){
                    CombParam combParam = new CombParam();
                    combParam.setPackNo(wrkDetl.getZpallet());
                    combParam.setPackName(wrkDetl.getMatnr());
                    combParam.setLocno(wrkMast.getLocNo());
//                    combParam.setPackName(wrkDetl.getMatnr());
                    combParam.setLocNo(wrkMast.getLocNo());
                    combParam.setPackSts(1);
                    combParam.setRequestTime(DateUtils.convert(new Date()));
                    result = postMesData(inpath,combParam);
@@ -84,7 +84,7 @@
                    CombParam combParam = new CombParam();
                    combParam.setPackNo(wrkDetl.getZpallet());
                    combParam.setPackName(wrkDetl.getMatnr());
                    combParam.setLocno(wrkMast.getLocNo());
                    combParam.setLocNo(wrkMast.getLocNo());
                    combParam.setPackSts(0);
                    combParam.setRequestTime(DateUtils.convert(new Date()));
                    result = postMesData(outPath,combParam);
@@ -93,7 +93,7 @@
                if(wrkDetl != null){
                    CombParam combParam = new CombParam();
                    combParam.setPackNo(wrkDetl.getZpallet());
                    combParam.setLocno(wrkMast.getLocNo());
                    combParam.setLocNo(wrkMast.getLocNo());
                    combParam.setPackSts(5);
                    combParam.setRequestTime(DateUtils.convert(new Date()));
                    result = postMesData(inpath,combParam);

 src/main/resources/application.yml

@@ -53,11 +53,12 @@
  groupCount: 2

mes:
  url: 127.0.0.1:8080/test
  url: 172.28.15.251:7899
  url2: 172.28.15.251:7899
  # 入库上报
  inPath: 172.28.15.251:7899/mes-pm/in/stock/condition/warehousing
  inPath: mes-pm/in/stock/condition/warehousing
  # 出库上报
  outPath: 172.28.15.251:7899/mes-pm/in/stock/condition/exWarehouse
  outPath: mes-pm/in/stock/condition/exWarehouse
  # 启动测试请求
  startUpTestPACK: 127.0.0.1:8080/ynwms/open/asrs/rpv/test/open/auth
  #暂停测试