#

zjj

2025-01-08 885ad511b35c66b26c2dd5c2dd1105dd04a7f9ff

 src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java

@@ -66,17 +66,17 @@
            return SUCCESS;
        }
        KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(docType.getDocName());
        if (kingDeeUtilType.entryId!=2){
            return SUCCESS;
        }
//        if (kingDeeUtilType.entryId!=2){
//            return SUCCESS;
//        }
        Date now = new Date();
        //条件拼接
        JSONObject jsonObjectFBillTypeID = new JSONObject();
        JSONObject jsonObjectFPickerId = new JSONObject();
        if (kingDeeUtilType.pakIn==1){
            jsonObjectFBillTypeID.put("FNUMBER","QTRKD01_SYS");
            jsonObjectFBillTypeID.put("FNUMBER","TLD01_SYS");
        }else {
            jsonObjectFBillTypeID.put("FNUMBER","QTCKD01_SYS");
            jsonObjectFBillTypeID.put("FNUMBER","TLD01_SYS");
            jsonObjectFPickerId.put("FStaffNumber","X0103_GLGW074_1");
        }

@@ -108,7 +108,11 @@
            orderedMap.put("FMATERIALID", jsonObjectFMATERIALID);
            orderedMap.put("FSTOCKID", jsonObjectFSTOCKID);
            orderedMap.put("FLOT", jsonObjectFLOT);
            orderedMap.put("FQty", orderDetl.getQty());                    // 将"FQty"放到最后
            if(orderDetl.getQty().equals(0.0)){
                orderedMap.put("FQty", orderDetl.getQty());
            }else{
                orderedMap.put("FQty", orderDetl.getQty()-orderDetl.getPrice());    // 将"FQty"放到最后
            }

            JSONObject jsonObjectEnd = new JSONObject(orderedMap);

@@ -132,7 +136,7 @@

        JSONObject jsonObject1 = new JSONObject();
        jsonObject1.put("data", jsonObjectModel);
        jsonObject1.put("FormId",kingDeeUtilType.correspondingFormId);
        jsonObject1.put("FormId",kingDeeUtilType.formId);
        String add = jsonObject1.toJSONString();
        //上报
        String response = "";
@@ -153,26 +157,43 @@
            Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
            String bool1=IsSuccess.toString();
            boolean bool = false;
            //保存完成原订单4转5 6.保存完成
            //保存完成原订单1转2 2.保存完成
            if(bool1.equals("true")){
                ObjectMapper objectMapper =  new ObjectMapper();
                JsonNode rootNode = objectMapper.readTree(response);
                bool = rootNode.get("Result").get("ResponseStatus").get("IsSuccess").asBoolean();
                log.info("审核bool:"+bool);
                //提交完成原订单4转6  6.上报完成
                log.info("保存bool:"+bool);
                //提交完成原订单1转2  2.上报完成
                if(bool){
                    success = true;
                    order.setSettle(6L);
                    order.setMemo("2");
                    order.setUpdateTime(new Date());
                    orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));

                    for(OrderDetl orderDetl:orderDetls){
                        orderDetl.setPrice(orderDetl.getQty());
                        orderDetl.setUpdateTime(new Date());
                        if(Cools.isEmpty(orderDetl.getBatch())){
                            orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>()
                                    .eq("order_no",order.getOrderNo())
                                    .eq("matnr",orderDetl.getMatnr()));
                        }else{
                            orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>()
                                    .eq("order_no",order.getOrderNo())
                                    .eq("matnr",orderDetl.getMatnr())
                                    .eq("batch",orderDetl.getBatch()));
                        }

                    }

                }
            }

            if (!bool1.equals("true") || !bool){
                order.setSettle(7L);
                order.setUpdateTime(new Date());
                orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
            }
//            if (!bool1.equals("true") || !bool){
//                order.setSettle(7L);
//                order.setUpdateTime(new Date());
//                orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
//            }

        } catch (Exception e) {
            log.error("fail", e);