#

1

1 天以前 3a12d57d962254c693ba03c15a30c8e3d37e415e

#

 src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java

@@ -32,7 +32,7 @@
    @Value("${erp.switch.ReviewOrderSwitch}")
    private boolean ReviewOrderSwitch;

    @Scheduled(cron = "0/20 * * * * ?")
//    @Scheduled(cron = "0/20 * * * * ?")
    @Async("orderThreadPool")
    public void completeAndReport(){
        if(!ReviewOrderSwitch){

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

@@ -143,7 +143,7 @@
            case "PRD_MORPT"://生产汇报单
                path = imProductinbillBatchAudit;
                idArray.add(order.getNumber());
                dataObj.fluentPut("id", idArray);
                dataObj.fluentPut("ids", idArray);
                return new JSONObject().fluentPut("data", dataObj);
            case "STK_MISCELLANEOUS"://其他入库单
                path = imOtheroutbillAudi;

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

@@ -181,7 +181,7 @@
                            .fluentPut("billentry_lk_stableid", 677270092232273922L)
                            .fluentPut("billentry_lk_sbillid", Long.parseLong(order.getItemName()))  // 主单ID
                            .fluentPut("billentry_lk_sid", Long.parseLong(orderDetl.getThreeCode()))  // 明细ID
                            .fluentPut("billentry_lk_baseqty_old", orderDetl.getAnfme())  // ERP数量
                            .fluentPut("billentry_lk_baseqty_old", orderDetl.getErpAnfme())  // ERP数量
                            .fluentPut("billentry_lk_baseqty", qty);  // 作业数量
                    billentryLkArray1.add(billentryLk);
                    // 创建 billentry 对象，填充缺失的字段
@@ -189,11 +189,11 @@
                            .fluentPut("id", 0L)
                            .fluentPut("warehouse_number", orderDetl.getManu())  // 仓库编号
                            .fluentPut("qty", qty)  // 数量
                            .fluentPut("baseqty", qty)  // 数量
                            .fluentPut("prdqty", qty)  // 数量
                            .fluentPut("baseqty", qty)
                            .fluentPut("prdqty", qty)
                            .fluentPut("manubill", order.getDefNumber())
                            .fluentPut("producttype", "C")  // 物料编号
                            .fluentPut("qualitystatus", "A")  // 物料编号
                            .fluentPut("producttype", "C")
                            .fluentPut("qualitystatus", "A")
                            .fluentPut("billentry_lk", billentryLkArray1);

                    billentryArray1.add(billentry);
@@ -204,6 +204,8 @@
                                        .fluentPut("billno", UUID.randomUUID().toString().replace("-", "").substring(0, 16))
                                        .fluentPut("trdbillno", UUID.randomUUID().toString().replace("-", ""))
                                        .fluentPut("billstatus", "C")
                                        .fluentPut("invscheme_number", "331")
                                        .fluentPut("biztype_number", "330")
                                        .fluentPut("biztime", sdf1.format(now1))
                                        .fluentPut("billentry", billentryArray1)  // 将 billentry 数组添加到请求参数
                        )));
@@ -331,12 +333,8 @@
                        JSONObject resultItem = resultArray.getJSONObject(i);
                        String billNo = resultItem.getString("number");  // 获取返回的单据号
                        String billId = resultItem.getString("id");      // 获取返回的ID
                        // 判断返回的单据号与订单号是否一致
                        if (billNo != null && billNo.equals(order.getOrderNo())) {
                            // 如果一致，设置订单的 number
                            order.setNumber(billId);
                            log.info("订单号 {} 与返回的单据号匹配，设置订单 ID 为 {}", order.getOrderNo(), billId);
                        }

                    }
                } else {
                    log.error("接口调用失败，失败的操作数量: {}", failCount);

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

@@ -97,7 +97,7 @@
            case "PRD_MORPT": // 进仓通知单提交
                path = imProductinbillBatchSubmit;
                idArray.add(order.getNumber());
                dataObj.fluentPut("id", idArray);
                dataObj.fluentPut("ids", idArray);
                return new JSONObject().fluentPut("data", dataObj);
            case "STK_MISCELLANEOUS"://其他入库单
                path = imOtherinbillSubmit;