修复订单系统

野心家

2023-04-27 c327ae2c32c988c43d6881c9caf196e42bab3f8c

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

@@ -576,7 +576,7 @@
        String jsonLocNo = (String) json.get("locNo");
        Node node = nodeService.selectOne(new EntityWrapper<Node>()
                .eq("name", jsonLocNo));

       //查订单
        String jsonOrderNo = (String) json.get("orderNo");
        Order order = orderService.selectOne(new EntityWrapper<Order>()
                .eq("order_no", jsonOrderNo));
@@ -584,15 +584,23 @@
            return R.error("参数为空");
        }

        //判断订单类型是否是入库
        DocType docType=docTypeService.selectById(order.getDocType());
        if(docType.getPakin()!=1 || docType.getStatus()!=1){
            return R.error("该订单是出库订单，无法入库");
        }

        JSONArray combMats = json.getJSONArray("combMats");
        for (int i = 0; i < combMats.size(); i++) {
            OrderDetl jsonOrderDetl = combMats.getObject(i, OrderDetl.class);
            OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>()
                    .eq("order_no", jsonOrderNo));
                    .eq("order_no", jsonOrderNo)
                    .and()
                    .eq("maktx",jsonOrderDetl.getMaktx()));
            if (Cools.isEmpty(orderDetl)) {
                return R.error("单据明细有误,请检查");
            }
            if (orderDetl.getAnfme() - (jsonOrderDetl.getAnfme() + orderDetl.getQty()) < 0) {
            if (orderDetl.getAnfme() - (jsonOrderDetl.getAnfme() + orderDetl.getWorkQty()) < 0) {
                return R.error("入库数量大于可入数量");
            }
            ManLocDetl checkManLocDetl = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
@@ -604,23 +612,34 @@
                manLocDetl.setLocNo(node.getName());
                manLocDetl.setNodeId(node.getId());
                manLocDetl.setMatnr(orderDetl.getMatnr());
                manLocDetl.setMaktx(orderDetl.getMaktx());
                manLocDetl.setAnfme(orderDetl.getAnfme());
                manLocDetl.setMaktx(jsonOrderDetl.getMaktx());
                manLocDetl.setAnfme(jsonOrderDetl.getAnfme());
                manLocDetl.setModiTime(date);
                manLocDetl.setCreateTime(date);
                manLocDetlService.insert(manLocDetl);
            } else {
                checkManLocDetl.setAnfme(checkManLocDetl.getAnfme() + orderDetl.getAnfme());
                checkManLocDetl.setAnfme(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme());
                checkManLocDetl.setModiTime(date);
                manLocDetlService.update(checkManLocDetl, new EntityWrapper<ManLocDetl>()
                        .eq("loc_no", jsonLocNo)
                        .eq("matnr", orderDetl.getMatnr()));
            }

            orderDetl.setQty(orderDetl.getQty() + jsonOrderDetl.getAnfme());
            orderDetl.setWorkQty(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme());
            orderDetl.setUpdateTime(date);
            orderDetlService.updateById(orderDetl);

            //更新订单状态
            //工作中的数量小于总订单数时，订单状态改为2，作业中
            if(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme() < orderDetl.getAnfme()){
                order.setSettle(2L);
            }else{
                //工作中的数量等于总订单数时，订单状态改为4,完成
                order.setSettle(4L);
            }
            if(!orderService.updateById(order)){
                return R.error("更新订单状态失败");
            }

        }
        orderService.checkComplete(order.getOrderNo());
@@ -639,6 +658,12 @@
        String jsonOrderNo = (String) json.get("orderNo");
        Order order = orderService.selectOne(new EntityWrapper<Order>()
                .eq("order_no", jsonOrderNo));

        //判断订单类型是否是入库
        DocType docType=docTypeService.selectById(order.getDocType());
        if(docType.getPakout()!=1 || docType.getStatus()!=1){
            return R.error("该订单是出库订单，无法入库");
        }
        if (Cools.isEmpty(node, order)) {
            return R.error("参数为空");
        }
@@ -680,6 +705,18 @@
            orderDetl.setUpdateTime(date);
            orderDetlService.updateById(orderDetl);

            //更新订单状态
            //工作中的数量小于总订单数时，订单状态改为2，作业中
            if(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme() < orderDetl.getAnfme()){
                order.setSettle(2L);
            }else{
                //工作中的数量等于总订单数时，订单状态改为4,完成
                order.setSettle(4L);
            }
            if(!orderService.updateById(order)){
                return R.error("更新订单状态失败");
            }

            orderService.checkComplete(order.getOrderNo());
        }
        return R.ok("下架完成");