#

lsh

2024-01-19 5110b6563db73a2869e0ac09e717928289cdfdde

#

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

@@ -224,7 +224,7 @@
    @PostMapping("/palletizing/complete/auth/v1")
    @AppAuth(memo = "中控(2楼)：码垛完成下发入库信息")
    public synchronized R palletizingComplete(@RequestHeader(required = false) String appkey,
                                           @RequestBody PalletizingCompleteParam param,
                                           @RequestBody PalletizingCompleteParam2 param,
                                           HttpServletRequest request) {
//        appkey = "ea1f0459efc02a79f046f982767939ae";


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

New file
@@ -0,0 +1,62 @@
package com.zy.asrs.entity.param;

import lombok.Data;

import java.util.List;

/*
 *  Created by Monkey D. Luffy on 2023.07.19
 * */
@Data
public class PalletizingCompleteParam2 {

    private String barcode;//    是    字符串    托盘码
    private Integer palletizingNo;//    是    字符串    码垛位编号
    private Integer palletizingNo2;//    是    字符串    目标位置编号
    private String boxType;//    是    字符串    木箱类型
    private String orderNo;//    是    字符串    订单编号
    private String uuid;//    是    字符串    订单编号
    private String createTime;//    是    字符串    创建时间

    private List<MatList> matLists;//        是    列表    拆垛货物信息（2箱，尾箱可能1箱）

    @Data
    public static class MatList{
        private String matnr;//    是    字符串    物料编码
        private String maktx;//    是    字符串    物料名称
        private String boxNo;//    是    字符串    木箱编号（唯一字段，出库依据，出库时按照木箱编号出库）
        private String position;//    是    字符串    木箱码垛位置（拆垛时需要）
        private Double weight;//    是    小数型    重量
        private Integer anfme;//    是    数字型    木箱中铜箔数量
        private String batch;//    (是否分批)    字符串    批次号
        private String specs;//    (是否需要）    字符串    规格
        private String standby4;//        卷信息uuid
        private List<MatDetlList> matDetlList;//        是    列表    木箱中铜箔信息
    }

    @Data
    public static class MatDetlList{
        private String boxNoDetl;//    是    字符串    铜箔编号（唯一字段）
        private String positionDetl;//    是    字符串    铜箔位置（拆垛时需要）
        private Double weightDetl;//    是    小数型    重量
        private String batchDetl;//    (是否分批)    字符串    批次号
        private String specsDetl;//    (是否需要）    字符串    规格
    }

//    public Integer getDevNo$(){
//        if (!Cools.isEmpty(this.palletizingNo)){
//            switch (this.palletizingNo){
//                case "1":
//                    return 219;
//                case "2":
//                    return 215;
//                case "3":
//                    return 118;
//                default:
//                    return null;
//            }
//        }
//        return null;
//    }

}

 src/main/java/com/zy/asrs/service/OpenService.java

@@ -50,7 +50,7 @@

    void balconyComplete(LabellerMatParam param);

    void palletizingComplete(PalletizingCompleteParam param);
    void palletizingComplete(PalletizingCompleteParam2 param);
    void palletizingCompleteS(PalletizingCompleteParam param);

    void singleUnstackingComplete(SingleUnstackingCompleteParam param);

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

@@ -694,7 +694,7 @@
     * */
    @Override
    @Transactional
    public void palletizingComplete(PalletizingCompleteParam param) {
    public void palletizingComplete(PalletizingCompleteParam2 param) {
        Long userId = 7777L;//中控
        //判断param参数
        if (Cools.isEmpty(param.getBarcode())){
@@ -710,7 +710,7 @@
        ArrayList<String> positions = new ArrayList<>();   //木箱位置查重      (orgin)
        ArrayList<String> boxNos = new ArrayList<>();   //木箱唯一编码查重  （batch）
        //判断matLists参数
        for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
        for (PalletizingCompleteParam2.MatList matList:param.getMatLists()){
            if (Cools.isEmpty(matList.getMatnr())){
                throw new CoolException("参数：物料编码 matnr为空");
            }else if (Cools.isEmpty(matList.getPosition())){
@@ -759,7 +759,7 @@


        Date now = new Date();
        for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
        for (PalletizingCompleteParam2.MatList matList:param.getMatLists()){
            long rollUp = new Date().getTime();
            Mat mat = matService.selectByMatnr(matList.getMatnr());
            if (Cools.isEmpty(mat)) {
@@ -782,7 +782,7 @@
            waitPakin.setModiTime(now);
            waitPakin.setRollUp(rollUp);
            if (!Cools.isEmpty(matList.getMatDetlList())){
                for (PalletizingCompleteParam.MatDetlList matDetlList:matList.getMatDetlList()){
                for (PalletizingCompleteParam2.MatDetlList matDetlList:matList.getMatDetlList()){
                    LocDetlRullUpDetail locDetlRullUpDetail = new LocDetlRullUpDetail();
                    locDetlRullUpDetail.setUuid(rollUp);
                    locDetlRullUpDetail.setRollNo(matDetlList.getBoxNoDetl());

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

@@ -61,15 +61,32 @@
                    || !basDevp.getAutoing().equals("Y") || !basDevp.getLoading().equals("Y") || !basDevp.getInEnable().equals("Y")){
                return FAIL;
            }
            BasDevp basDevp131 = basDevpService.selectById(131);
            if (Cools.isEmpty(basDevp131) || !basDevp131.getAutoing().equals("Y") || !( basDevp131.getWrkNo()>9899 && basDevp131.getWrkNo()<10000)){
                return FAIL;
            }
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                    .eq("wrk_no", basDevp.getWrkNo()).eq("source_sta_no",145));
            if (Cools.isEmpty(wrkMast) || wrkMast.getIoType()!=1 || wrkMast.getWrkSts()!=2){
                return FAIL;
            }
            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
            if (Cools.isEmpty(wrkDetls) || wrkDetls.size()!=1){
                return FAIL;
            }
            BasDevp basDevp118 = basDevpService.selectById(118);
            if (Cools.isEmpty(basDevp118) || !basDevp118.getAutoing().equals("Y") || basDevp118.getReportSign()!=0 ){
                return FAIL;
            }
            BasDevp basDevp119 = basDevpService.selectById(119);
            if (Cools.isEmpty(basDevp119) || basDevp119.getReportSign()!=0){
                return FAIL;
            }

            if (basDevp118.getLoading().equals("Y")){
                //生成机械臂任务


//            TrussCombParam trussCombParam = new TrussCombParam(param, order, orderDetlList);
//                TrussCombParam trussCombParam = new TrussCombParam(param, order, orderDetlList);
//            try{
//                ReturnT<String> success = postMesData(reportOutPath, trussCombParam);
//                if (success.getCode()!=200){
@@ -78,6 +95,11 @@
//            } catch (Exception e){
//                throw new CoolException("桁架上位软件退库失败");
//            }
            }else {
                //生成拆盘任务
            }

//
        }catch (Exception e){
            log.error("异常！！！"+e);
            return FAIL;

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

@@ -49,6 +49,9 @@

    public ReturnT<String> start(int staNo) {
        try {
            if(true){
                return FAIL;
            }
            BasDevp basDevp = basDevpService.selectById(staNo);
            Integer staOther = getStaOther(staNo);
            Integer staEnd = getStaEnd(staNo);
@@ -65,7 +68,7 @@
                return FAIL;
            }
            WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 202).eq("source_sta_no", staEnd));
            if (!Cools.isEmpty(wrkMast1)) return FAIL;
            if (!Cools.isEmpty(wrkMast1) && wrkMast1.getWrkSts()==51) return FAIL;
            if (!Cools.isEmpty(basDevp) && basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()!=0){ //上传前工作号跟电控约定为9992中控(桁架)：码垛完成下发入库信息（你可以自定义）

                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
@@ -82,21 +85,21 @@
                ReturnT<String> result = null;
                result = postMesData(reportOutPath,singleMountUnstackingCompleteParam);
//                System.out.println(result);
                if (true){
                    for (WrkDetl wrkDetl:wrkDetls){
                        WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
                        wrkDetlSingle.sync(wrkDetl);
                        wrkDetlSingle.setWrkNo(wrkDetl.getWrkNo().longValue());
                        wrkDetlSingleService.insert(wrkDetlSingle);
                    }
                    wrkMast.setSheetNo("1");
                    wrkMastService.updateById(wrkMast);
                    basDevp.setReportSign(1);
                    basDevpService.updateById(basDevp);
                    basDevpEnd.setReportSign(1);
                    basDevpService.updateById(basDevp);
                    return SUCCESS;
                }
//                if (true){
//                    for (WrkDetl wrkDetl:wrkDetls){
//                        WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();
//                        wrkDetlSingle.sync(wrkDetl);
//                        wrkDetlSingle.setWrkNo(wrkDetl.getWrkNo().longValue());
//                        wrkDetlSingleService.insert(wrkDetlSingle);
//                    }
//                    wrkMast.setSheetNo("1");
//                    wrkMastService.updateById(wrkMast);
//                    basDevp.setReportSign(1);
//                    basDevpService.updateById(basDevp);
//                    basDevpEnd.setReportSign(1);
//                    basDevpService.updateById(basDevp);
//                    return SUCCESS;
//                }
                if (result.getCode()==200){
                    for (WrkDetl wrkDetl:wrkDetls){
                        WrkDetlSingle wrkDetlSingle = new WrkDetlSingle();

 src/main/java/com/zy/common/service/CommonService.java

@@ -317,7 +317,7 @@

        // 1.按规则查找库位
        if (Cools.isEmpty(locMast) && crnNo != 0) {
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O").orderBy("lev1",true));
            for (LocMast locMast1 : locMasts) {
                if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
                    continue;