#

lsh

2024-07-13 e597bd9ea3fb7b51e6abacd02b2ccbf409503d7b

#

 src/main/java/com/zy/asrs/task/escalationParam/ScaleEscalationParam.java

@@ -18,11 +18,13 @@
    private String palletizingNo;//    是    字符串    码垛木箱类型（同一托盘一种类型）  废弃
    private String createTime;//        是    字符串    创建时间
    private Double weight;//        是    字符串    创建时间
    private Integer devNo;//        是    字符串    时间戳


    public ScaleEscalationParam(){}

    public ScaleEscalationParam(Double weight){
    public ScaleEscalationParam(Double weight,Integer devNo){
        this.weight = weight;
        this.devNo = devNo;
    }
}

 src/main/java/com/zy/asrs/task/escalationParam/StaEscalationParam.java

@@ -13,39 +13,9 @@
 * */
@Data
public class StaEscalationParam {
    private String barcode;//    是    字符串    托盘码
    private String boxType;//    是    字符串    码垛木箱类型（同一托盘一种类型）
    private String palletizingNo;//    是    字符串    码垛木箱类型（同一托盘一种类型）  废弃
    private String createTime;//        是    字符串    创建时间
    private String uuid;//        是    字符串    时间戳
    private Integer staStart;//        是    字符串    起始站点（托盘所在站点）
    private Integer staEnd;//        是    字符串    目标站点（拆垛目的站点）
    private List<MatList> matList;//        是    列表    拆垛剩余货物信息(可以为空)

    @Data
    public static class MatList{
        private String position;//        是    字符串    木箱码垛位置
        private boolean unstackingEnd;//    尾箱标识（最后一托为true，其他为false）
        private String boxNo;//        是    字符串    木箱编号（唯一字段，出库依据，出库时按照木箱编号出库）
    }

    public StaEscalationParam(){}

    public StaEscalationParam(WrkMast wrkMast, List<WrkDetl> wrkDetlList){
        Date now = new Date();
        this.barcode=wrkMast.getBarcode();
        this.boxType=wrkDetlList.get(0).getBrand();
        createTime=now.toString();
        uuid=String.valueOf(now.getTime());
        List<MatList> matLists=new ArrayList<>();
        for (WrkDetl wrkDetl:wrkDetlList){
            MatList matList = new MatList();
            matList.setBoxNo(wrkDetl.getBatch());
            matList.setPosition(wrkDetl.getOrigin());
            matList.setUnstackingEnd(false);
            matLists.add(matList);
        }

        this.matList = matLists;
    }
    private String matnr;//        是    字符串    时间戳
    private Integer ioType;//        是    字符串    时间戳
    private Integer devNo;//        是    字符串    时间戳
    private Double weight;//        是    字符串    时间戳
}

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

@@ -68,7 +68,7 @@
            if (!Cools.isEmpty(basDevp) && basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()==0){
                if (staProtocol.isAutoing() && staProtocol.getWorkNo()==0 && staProtocol.isInEnable()){
                    log.error("1楼翻转重量信息上传时，站点状态："+JSON.toJSONString(staProtocol));
                    ScaleEscalationParam scaleEscalationParam = new ScaleEscalationParam(basDevp.getGrossWt());
                    ScaleEscalationParam scaleEscalationParam = new ScaleEscalationParam(basDevp.getGrossWt(),basDevp.getDevNo());
                    ReturnT<String> result = postMesData(reportOutPath,scaleEscalationParam);
                    if (result.getCode()==200){
                        basDevp.setReportSign(1);

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

@@ -77,8 +77,11 @@

                    log.error("2楼翻转倒料信息上传时，站点状态："+JSON.toJSONString(staProtocol));
                    log.error("2楼翻转倒料信息上传时，工作号："+JSON.toJSONString(wrkMast));
                    StaEscalationParam staEscalationParam = new StaEscalationParam(wrkMast,wrkDetls);
                    staEscalationParam.setStaStart(staNo);
                    StaEscalationParam staEscalationParam = new StaEscalationParam();
                    staEscalationParam.setDevNo(staNo);
                    staEscalationParam.setIoType(wrkMast.getIoType()==101? 1:3);
                    staEscalationParam.setMatnr(wrkDetls.get(0).getMatnr());
                    staEscalationParam.setWeight(wrkDetls.get(0).getWeight());
                    ReturnT<String> result = postMesData(reportOutPath,staEscalationParam);
                    if (result.getCode()==200){
                        wrkMast.setSheetNo("2");