#

lsh

2024-01-25 51d30c2d083557189aebde54b60656bf1f7bd541

#

 src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java

@@ -6,6 +6,7 @@
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.Date;
import java.util.List;

@Mapper
@@ -26,4 +27,8 @@
    List<WrkDetl> selectPakoutQuery(@Param("staNo")Integer staNo, @Param("matnr")String matnr);

    List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo);

    int updateIoTimeWms(@Param("workNo") Integer workNo, @Param("ioTime") Date ioTime);


}

 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkMast;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

@@ -16,4 +17,8 @@

    List<WrkMast> selectToBeHistoryData();

    // work log -------------------------------------------------------
    @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
    int saveWrkMastLog(Integer workNo);

}

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

@@ -24,4 +24,6 @@

    List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo);

    boolean updateIoTimeWms(Integer workNo, Date ioTime);

}

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

@@ -21,4 +21,6 @@
     * @return
     */
    int getStoreCount(Integer crnNo);

    int saveWrkMastLog(Integer workNo);
}

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

@@ -89,4 +89,9 @@
    public List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo) {
        return this.baseMapper.selectAndLogByOrderNoGroupByMatnrOfSum(orderNo);
    }

    @Override
    public boolean updateIoTimeWms(Integer workNo, Date ioTime) {
        return this.baseMapper.updateIoTimeWms(workNo, ioTime) > 0;
    }
}

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

@@ -45,4 +45,10 @@
                .last(" and (wrk_sts in (1,2) or (wrk_sts=3 and wrk_no in (select wrk_no from asr_bas_devp)))"));
    }


    @Override
    public int saveWrkMastLog(Integer workNo){
        return this.baseMapper.saveWrkMastLog(workNo);
    };

}

 src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java

@@ -254,4 +254,111 @@

        return stockOutParams;
    }

    public static List<StockOutParam> OutboundClassificationNew(StockOutParam param){
        List<StockOutParam> stockOutParams = new ArrayList<>();

        List<StockOutParam.LocDetl> locDetls = param.getLocDetls();
        List<String> brands = new ArrayList<>();
        for (StockOutParam.LocDetl locDetl:locDetls){
            if (Cools.isEmpty(locDetl.getBrand())){
                locDetl.setBrand("");
            }
            if (!brands.contains(locDetl.getBrand())){
                brands.add(locDetl.getBrand());
            }
        }

        for (String brand : brands){
            List<StockOutParam.LocDetl> locDetls1 = new ArrayList<>();
            List<StockOutParam.LocDetl> locDetls2 = new ArrayList<>();
            List<StockOutParam.LocDetl> locDetls3 = new ArrayList<>();
            List<StockOutParam.LocDetl> locDetls4 = new ArrayList<>();
            List<StockOutParam.LocDetl> locDetls5 = new ArrayList<>();
            List<StockOutParam.LocDetl> locDetls6 = new ArrayList<>();
            for (StockOutParam.LocDetl locDetl:locDetls){
                if (Cools.isEmpty(locDetl.getBrand())){
                    locDetl.setBrand("");
                }
                if (locDetl.getBrand().equals(brand)){
                    switch (Utils.getRow(locDetl.getLocNo())){
                        case 1: case 2: case 3: case 4:
                            locDetls1.add(locDetl);
                            break;
                        case 5: case 6: case 7: case 8:
                            locDetls2.add(locDetl);
                            break;
                        case 9: case 10: case 11: case 12:
                            locDetls3.add(locDetl);
                            break;
                        case 13: case 14: case 15: case 16:
                            locDetls4.add(locDetl);
                            break;
                        case 17: case 18: case 19: case 20:
                            locDetls5.add(locDetl);
                            break;
                        case 21: case 22: case 23: case 24:
                            locDetls6.add(locDetl);
                            break;
                        default:
                    }
                }
            }
            ArrayList<List<StockOutParam.LocDetl>> lists = new ArrayList<>();
            lists.add(locDetls1);
            lists.add(locDetls2);
            lists.add(locDetls3);
            lists.add(locDetls4);
            lists.add(locDetls5);
            lists.add(locDetls6);

            int sign = 0;
            int staA=118;
            int staB=119;
            for (List<StockOutParam.LocDetl> locDetlList:lists){
                sign++;
                if (locDetlList.size()==0){
                    continue;
                }
                if (sign>lists.size()/2) {
                    //120、121
                    staA=120;
                    staB=121;
                }
                List<StockOutParam.LocDetl> locDetlsA = new ArrayList<>();
                List<StockOutParam.LocDetl> locDetlsB = new ArrayList<>();
                List<String> locNos = new ArrayList<>();
                for (StockOutParam.LocDetl locDetl:locDetlList){
                    if (locDetlsA.size()<locDetlList.size()/2){
                        locDetlsA.add(locDetl);
                        if (!locNos.contains(locDetl.getLocNo())){
                            locNos.add(locDetl.getLocNo());
                        }
                    }else {
                        if (locNos.contains(locDetl.getLocNo())){
                            locDetlsA.add(locDetl);
                        }else {
                            locDetlsB.add(locDetl);
                        }
                    }
                }
                if (locDetlsA.size()!=0){
                    StockOutParam stockOutParamA = new StockOutParam();
                    stockOutParamA.setOutSite(staA);
                    stockOutParamA.setOrderNo(param.getOrderNo());
                    stockOutParamA.setLocDetls(locDetlsA);
                    stockOutParams.add(stockOutParamA);
                }
                if (locDetlsB.size()!=0){
                    StockOutParam stockOutParamB = new StockOutParam();
                    stockOutParamB.setOutSite(staB);
                    stockOutParamB.setOrderNo(param.getOrderNo());
                    stockOutParamB.setLocDetls(locDetlsB);
                    stockOutParams.add(stockOutParamB);
                }
            }
        }

        return stockOutParams;
    }
}

 src/main/java/com/zy/common/web/WcsController.java

@@ -51,6 +51,8 @@
    private RowLastnoService rowLastnoService;
    @Autowired
    private WorkService workService;
    @Autowired
    private StaDescService staDescService;

    @PostMapping("/pakin/loc/v1")
    @ResponseBody
@@ -109,6 +111,155 @@
        return R.ok().add(dto);
    }

    @PostMapping("/pakin2/loc/v1")
    @ResponseBody
    @Transactional
    public synchronized R getLocNo2(@RequestBody SearchLocParam param) {
        if (Cools.isEmpty(param.getIoType())) {
            return R.error("入出库类型不能为空");
        }
        if (Cools.isEmpty(param.getSourceStaNo())) {
            return R.error("源站编号不能为空");
        }
        if (Cools.isEmpty(param.getBarcode())) {
            return R.error("条码不能为空");
        }

        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), false);
        sourceStaNo.setLocType1(param.getLocType1());
//        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        LocTypeDto locTypeDto = new LocTypeDto();
        locTypeDto.setLocType1((short)1);

        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                .eq("barcode", param.getBarcode())
                .eq("io_type", param.getIoType())
                .eq("wrk_sts",14));
        StartupDto dto = new StartupDto();

        if (Cools.isEmpty(wrkMast)){
            try{
                log.info("/pakin2/loc/v1:"+dto + "======托盘码:"+param.getBarcode()+"此笔工作档未查询到盘点/拣料出库任务，开始查询盘点/拣料再入库任务==》");
                WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                        .eq("barcode", param.getBarcode())
                        .eq("io_type", param.getIoType()-50)
                        .eq("wrk_sts",2));
                if (Cools.isEmpty(wrkMast1)){
                    return R.error("未查询到工作档===》托盘码:"+param.getBarcode());
                }
                // 获取目标站
                Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                        .eq("type_no", param.getIoType()-50)
                        .eq("stn_no", sourceStaNo.getDevNo())
                        .eq("crn_no", wrkMast1.getCrnNo());
                StaDesc staDesc = staDescService.selectOne(wrapper);
                if (Cools.isEmpty(staDesc)) {
                    log.error("type_no={},stn_no={},crn_no={}", param.getIoType()-50, sourceStaNo, wrkMast1.getCrnNo());
                    throw new CoolException("入库路径不存在");
                }
                if (!staDesc.getCrnStn().equals(wrkMast1.getStaNo())){
                    throw new CoolException("堆垛机作业站点与工作号目标站点不一致！！！请联系工程师修改"+
                            "\\n堆垛机号："+wrkMast1.getCrnNo()+
                            "\\n堆垛机站点："+staDesc.getCrnStn()+
                            "\\n工作号："+wrkMast1.getWrkNo()+
                            "\\n工作档目标站点："+wrkMast1.getStaNo());
                }
                dto.setWorkNo(wrkMast1.getWrkNo());
                dto.setCrnNo(wrkMast1.getCrnNo());
                dto.setLocNo(wrkMast1.getLocNo());
                dto.setStaNo(wrkMast1.getStaNo());
                dto.setSourceStaNo(wrkMast1.getSourceStaNo());
                log.info("/pakin2/loc/v1:"+dto + "======托盘码:"+param.getBarcode()+"此笔工作档已经是盘点再入库状态，返回wcs下发信息");
                return R.ok().add(dto);
            }catch (Exception e){
                log.error("/pakin2/loc/v1:======托盘码:"+param.getBarcode()+"盘点回库查询工作档出错======>"+e);
                return R.error("查看wms==>info==>error");
            }
        }

        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
        if (Cools.isEmpty(locDetls) || locDetls.size()<1){
            return R.error("托盘码:"+param.getBarcode()+",未查到库存明细");
        }else {
            if (!locDetls.get(0).getLocNo().equals(wrkMast.getSourceLocNo())){
                return R.error("明细已经被修改,故障");
            }
        }

        Date now = new Date();
        if (param.getIoType() == 107) {//盘点再入库
            try{
                // 检索库位
                try{
                    dto = commonService.getLocNo(1, 1, param.getSourceStaNo(), locDetls.get(0).getMatnr(),null,null, locTypeDto);
                }catch (Exception e){
                    log.error("堆垛机站盘点再入库查询库位出错:"+e.getMessage()+e);
                    throw new Exception("查询库位出错，参数：param.getSourceStaNo():"+param.getSourceStaNo()+"==>locDetls:"+locDetls+"==>locTypeDto:"+locTypeDto);
                }
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", dto.getLocNo()));
                if (Cools.isEmpty(locMast) || Cools.isEmpty(locMast.getLocSts())){
                    throw new Exception("目标库位locMast查询为空||locMast.getLocSts为空");
                }else {
                    if (!locMast.getLocSts().equals("O")){
                        throw new Exception("目标库位！locMast.getLocSts.equals(“O”)"+locMast.getLocSts());
                    }else {
                        locMast.setLocSts("Q");
                        locMast.setBarcode(param.getBarcode());
                        if (!locMastService.updateById(locMast)) {
                            log.error(" /pakin2/loc/v1 --- 修改库位状态失败！" + locMast.getLocNo());
                            throw new Exception("修改库位状态失败");
                        }
                    }
                }
                if (!locDetlService.updateLocNo(locMast.getLocNo(),wrkMast.getSourceLocNo())){
                    log.error(" /pakin2/loc/v1 --- 库存明细转移失败！" + wrkMast.getWrkNo());
                    throw new Exception("库存明细转移失败");
                }
                // 修改源库位状态 O 空库位
                LocMast locMast2 = locMastService.selectById(wrkMast.getSourceLocNo());
                locMast2.setLocSts("O");
                locMast2.setBarcode("");
                locMast2.setModiTime(now);
                if (!locMastService.updateById(locMast2)) {
                    log.error(" /pakin2/loc/v1 --- 修改源库位状态失败！" + wrkMast.getSourceLocNo());
                    throw new Exception("修改源库位状态失败");
                }

                try{
                    // 保存工作主档历史档
                    if (wrkMastService.saveWrkMastLog(wrkMast.getWrkNo())==0) {
                        log.error(" stnToCrnStnPick2 --- 保存工作主档历史档失败！" + wrkMast.getWrkNo());
                    }
                    // 更新工作档数据状态
                    wrkMast.setIoTime(now);
                    wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 107->57  103->53
                    wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
                    wrkMast.setSourceStaNo(param.getSourceStaNo()); // 源站
                    wrkMast.setStaNo(dto.getStaNo()); // 目标站
                    wrkMast.setModiTime(now);
                    wrkMast.setLocNo(dto.getLocNo());
                    wrkMast.setCrnNo(dto.getCrnNo());
                    if (!wrkMastService.updateById(wrkMast)) {
                        log.error(" stnToCrnStnPick --- 更新工作档数据状态失败！" + wrkMast.getWrkNo());
                        throw new CoolException("更新工作档数据状态失败");
                    }
                    // 更新明细档io_time (历史档关联使用）
                    wrkDetlService.updateIoTimeWms(wrkMast.getWrkNo(),now);
                }catch (Exception e){
                    throw new CoolException("更新工作档数据状态出错");
                }
            }catch (Exception e){
                log.error("/pakin2/loc/v1:======托盘码:"+param.getBarcode()+"盘点回库出错======>"+e);
                return R.error("查看wmsError");
            }
        } else {
            return R.error();
        }
        log.info("/pakin2/loc/v1:"+dto + "======托盘码:"+param.getBarcode());
        return R.ok().add(dto);
    }

    @PostMapping("/pakin/empty/loc/v1")
    @ResponseBody
    public synchronized R getLocNoEmpty(@RequestBody SearchLocParam param) {

 src/main/resources/mapper/WrkDetlMapper.xml

@@ -130,4 +130,11 @@
        group by awdl.wrk_no, awdl.io_time, awdl.matnr ,awdl.zpallet,awdl.specs,awdl.maktx,awdl.batch,awdl.source
    </select>

    <update id="updateIoTimeWms">
        update asr_wrk_detl
        set io_time = #{ioTime}
        where 1=1
        and wrk_no = #{workNo}
    </update>

</mapper>