自动化立体仓库 - WMS系统
parent: dfc95523 | 补丁 | 提交 | ignore whitespace
zhangc
2025-03-11 1286f6fd5625d3d058d1dcff11b8fda303d6c455 
四期
6个文件已修改
82 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/AgvOpenController.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/AgvWrkDetlMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/agvStoMan/stoQue.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/agvStoMan/stoQue.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 src/main/java/com/zy/asrs/controller/AgvOpenController.java


@@ -180,8 +180,13 @@




            //出库任务 101.出库 || 103.拣料出库 || 107.盘点出库


            if (agvWrkMast.getIoType() == 101 || agvWrkMast.getIoType() == 103 || agvWrkMast.getIoType() == 107) {


                //修改出库站点状态


                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());


                AgvBasDevp byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getLocNo());


                if (byDevNo != null) {


                    log.info("出库任务进入站点===>>站点码：{}，站点状态{}", byDevNo.getDevNo(), byDevNo.getLocSts());


                    //修改出库站点状态


                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());




                }


            }


            //出库任务 110.空板出库


            if (agvWrkMast.getIoType() == 110) {


@@ -225,16 +230,29 @@


                    String locSts = "O";


                    if (byDevNo != null) {


                        assert log != null;


                        log.info("料架离开时当前站点状态:{}", byDevNo.getLocSts());


                        if (("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts()))) {


                        log.info("料架离开时当前站点状态:{},{}", byDevNo.getDevNo(), byDevNo.getLocSts());


                        if ("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts())) {


                            log.info("料架离开时当前站点状态保持不变1:{},{}", byDevNo.getDevNo(), byDevNo.getLocSts());


                            locSts = byDevNo.getLocSts();


                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), locSts, byDevNo.getBarcode(), null);


                        } else {


                            log.info("料架离开时当前站点状态保持不变2:{},{}", byDevNo.getDevNo(), byDevNo.getLocSts());


                            locSts = "O";


                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), locSts, "", null);


                        }


                    }


                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), locSts, "", null);


                    break;


            }




            if (agvWrkMast.getIoType() == 108 || agvWrkMast.getIoType() == 114) {


                //更新库存明细


                agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());


                //修改源库位状态为O


                agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);


            } else if (agvWrkMast.getIoType() == 109 && !agvWrkMast.getSourceLocNo().substring(0, 2).equals("DB")) {


                //修改源库位状态为O


                agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);


            }


            //if(agvWrkMast.getIoType() == 1 || agvWrkMast.getIoType() == 53 || agvWrkMast.getIoType() == 57 || agvWrkMast.getIoType() == 10){


            //    //修改源站点状态为O.空，以及解绑托盘条码


            //    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",null);




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


@@ -38,7 +38,7 @@


    Double sumAnfmeByMatnr(@Param("matnr") String matnr, @Param("threeCode") String threeCode, @Param("orderNo") String orderNo);






    @Select("SELECT d.matnr,d.three_code,d.order_no,SUM(d.anfme) anfme from agv_wrk_detl d ,agv_wrk_mast m where d.wrk_no=m.wrk_no and m.io_type in (101,103,53)  AND d.process_sts != 1 GROUP BY d.matnr,d.three_code,d.order_no")


    @Select("SELECT d.matnr,d.three_code threeCode,d.order_no orderNo,SUM(d.anfme) anfme from agv_wrk_detl d ,agv_wrk_mast m where d.wrk_no=m.wrk_no and m.io_type in (101,103,53)  AND d.process_sts != 1 GROUP BY d.matnr,d.three_code,d.order_no")


    List<AgvWrkDetl> listAnfmeByMatnr();




}




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


@@ -903,7 +903,7 @@


                    }


                }


            }


            if (agvLocMast==null){


            if (agvLocMast == null) {


                throw new CoolException("没有该类型的空库位了");


            }




@@ -1345,6 +1345,9 @@


                if (wrkMast.getIoType() == 112) {


                    throw new CoolException("当前作业不能取消！");


                }


                if (wrkMast.getIoType() == 108 && wrkMast.getWrkSts() >= 204) {


                    throw new CoolException("源库位已经释放，当前作业不能取消！");


                }


                // 源库位


                String locNo = wrkMast.getSourceLocNo();


                // 目标库位


@@ -1407,6 +1410,9 @@




                // 回流单取消


            } else if (wrkMast.getIoType() == 114) {


                if (wrkMast.getWrkSts() >= 204) {


                    throw new CoolException("源库位已经释放，当前作业不能取消！");


                }


                //源库位


                String locNo = wrkMast.getSourceLocNo();


                // 目标库位




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


@@ -28,6 +28,8 @@


import java.util.*;


import java.util.stream.Collectors;




import static org.reflections.Reflections.log;




@Slf4j


@Service


public class AgvWrkMastHandler extends AbstractHandler<String> {


@@ -188,7 +190,15 @@


                    break;


                case 10:


                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "D", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());


                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", (short) 0);


                    AgvBasDevp byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());


                    if (byDevNo != null) {


                        if ("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts())) {




                        } else {


                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());


                        }


                    }


                    //agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", (short) 0);


                    break;


                case 11:


                case 12:


@@ -246,7 +256,14 @@




                    });


                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());


                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());


                     byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());


                    if (byDevNo != null) {


                        if ("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts())) {




                        } else {


                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());


                        }


                    }


                    break;


                case 57:


                    // 更新库存明细


@@ -263,7 +280,14 @@


                        }


                    });


                    // 更新站点 + 库位状态     源库位是站点


                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());


                     byDevNo = agvBasDevpService.getByDevNo(agvWrkMast.getSourceLocNo());


                    if (byDevNo != null) {


                        if ("S".equals(byDevNo.getLocSts()) || "F".equals(byDevNo.getLocSts())) {




                        } else {


                            agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());


                        }


                    }


                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue(), agvWrkMast.getCtnNo());


                    break;


                case 58:


@@ -273,10 +297,10 @@


                case 108:


                case 114:


                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());


                    //更新库存明细


                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());


                    //修改源库位状态为O


                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);


//                    //更新库存明细


//                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());


//                    //修改源库位状态为O


//                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);


                    break;


                case 109:


                    // 库位 -- 接驳位 / 库位


@@ -292,7 +316,7 @@


                        // 库位 -- 接驳位 / 库位


                    } else {


                        //修改源库位状态为O


                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);


                        //agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);


                    }


                    break;


                case 111:




 src/main/webapp/static/js/agvStoMan/stoQue.js


@@ -165,7 +165,7 @@


            case 'locDetl':


                // locDetl(data.locNo);


                if (data.locSts.trim() === ''


                    || data.locSts.trim() === 'S'


                        //|| data.locSts.trim() === 'S'


                    || data.locSts.trim() === 'D'


                    || data.locSts.trim() === 'O')  {


                    layer.msg("此库位的状态不存在物料");




 src/main/webapp/views/agvStoMan/stoQue.html


@@ -107,7 +107,7 @@


<script type="text/javascript" src="../../static/layui/layui.js?v=100" charset="utf-8"></script>


<script type="text/javascript" src="../../static/js/common.js?v=100" charset="utf-8"></script>


<script type="text/javascript" src="../../static/js/cool.js?v=100" charset="utf-8"></script>


<script type="text/javascript" src="../../static/js/agvStoMan/stoQue.js?v=100" charset="utf-8"></script>


<script type="text/javascript" src="../../static/js/agvStoMan/stoQue.js?v=101" charset="utf-8"></script>


</body>


</html>