自动化立体仓库 - WMS系统
zjj
2023-06-17 8d57e6bfaccbab25b95332e9bd556d25d1fbbaf7
#自动完成工作档时更新拣货单数量
4个文件已修改
19 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/OutController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/ManPakOut.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OutController.java
@@ -261,7 +261,7 @@
        manPakOut.setMatnr(locDto.getMatnr());
        manPakOut.setMaktx(locDto.getMaktx());
        manPakOut.setDocNum(locDto.getOrderNo());
        manPakOut.setCount(0);
        manPakOut.setCount(0.0);
        manPakOut.setStatus(0);
        manPakOut.setCreateTime(new Date());
        manPakOut.setBatch(locDto.getBatch());
src/main/java/com/zy/asrs/entity/ManPakOut.java
@@ -140,7 +140,7 @@
     * 数量
     */
    @ApiModelProperty(value= "数量")
    private Integer count;
    private Double count;
    /**
     * 重量
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -645,7 +645,7 @@
            manPakOutEntityWrapper.eq("matnr",jsonOrderDetl.getMatnr());
            ManPakOut manPakOut = manPakOutService.selectOne(manPakOutEntityWrapper); //获取拣货单中的对应的订单
            if(manPakOut.getCount() == null){
                manPakOut.setCount(0);
                manPakOut.setCount(0.0);
            }
//            if (jsonOrderDetl.getAnfme() > manPakOut.getAnfme()) { //判断工作数量是否大于拣货单的数量
//                return R.error("出库数量大于拣货单总数量");
@@ -700,7 +700,7 @@
                return R.error("更新订单状态失败");
            }
            if(manPakOut.getCount() == null){
                manPakOut.setCount(0);
                manPakOut.setCount(0.0);
            }
            manPakOut.setCount(manPakOut.getCount()+jsonOrderDetl.getAnfme().intValue());
            if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -37,6 +37,8 @@
    private OrderDetlService orderDetlService;
    @Autowired
    private OrderService orderService;
    @Autowired
    private ManPakOutService manPakOutService;
    public ReturnT<String> start(WrkMast wrkMast) {
        // 4.入库完成
@@ -380,6 +382,15 @@
                        return FAIL.setMsg("更新订单完成数量失败");
                    }
                    EntityWrapper<ManPakOut> manPakOutEntityWrapper = new EntityWrapper<>();
                    manPakOutEntityWrapper.eq("doc_num",wrkDetls101.get(0).getOrderNo());
                    manPakOutEntityWrapper.eq("matnr",wrkDetls101.get(0).getMatnr());
                    ManPakOut manPakOut = manPakOutService.selectOne(manPakOutEntityWrapper);
                    manPakOut.setCount(manPakOut.getCount() + wrkDetls101.get(0).getAnfme());
                    if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){
                        return FAIL.setMsg("更新拣货单完成数量失败");
                    }
                    Boolean finsihed = orderDetlService.checkAllDetlFinish(wrkDetls101.get(0).getOrderNo());
                    if (finsihed) {