#

1

昨天 371af76976cec152184123fac0073efcba2b5a70

#

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

@@ -47,7 +47,7 @@
            List<Order> orders = orderService.selectComplete();
            if(orders.size() > 0){
                for (Order order : orders) {
                    if((order.getDocType() == 3 || order.getDocType() == 16) && order.getPayType() == null){ //走新增提交审核流程
                    if((order.getDocType() == 3 || order.getDocType() == 16 || order.getDocType() == 23) && order.getPayType() == null){ //走新增提交审核流程
                        ReturnT<String> result = saveOrderSyncHandler.start(order);//4已完成
                        if (!result.isSuccess()) {
                            log.error("单据[orderNo={}]新增保存至erp失败", order.getOrderNo());

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

@@ -34,7 +34,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

@@ -121,9 +121,9 @@
                idArray.add(order.getOrderNo());
                dataObj.fluentPut("billno", idArray);
                return new JSONObject().fluentPut("data", dataObj);
            case "STK_imSaloutbill"://销售出库上报
            case "STK_imSaloutbill":
                path = imSaloutbillReport;
                idArray.add(order.getOrderNo());
                idArray.add(order.getShipCode());
                dataObj.fluentPut("billno", idArray);
                return new JSONObject().fluentPut("data", dataObj);
            case "SAL_RETURNSTOCK"://销售退料单
@@ -232,6 +232,12 @@
                    order.setDocType(23L);
                    order.setSettle(4L);//转为出库单据上报
                }else{
                    if(order.getDocType() == 23L){
                        Order order1 = orderService.selectOne(new EntityWrapper<Order>().eq("salesman",order.getOrderNo()));
                        order1.setPayType(null);
                        order1.setSettle(4L);
                        orderService.updateById(order1);
                    }
                    order.setSettle(8L); // 更新状态为已上报审核 9->8
                }
                orderService.updateById(order);

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

@@ -270,7 +270,7 @@
                        .fluentPut("data", new JSONArray(Arrays.asList(
                                new JSONObject()
                                        .fluentPut("id", 0L)
                                        .fluentPut("billno", order.getOrderNo())
                                        .fluentPut("billno", UUID.randomUUID().toString().replace("-", "").substring(0, 16))
                                        .fluentPut("bizorg_number", "BU-00001")
                                        .fluentPut("dept_number", "Org-00002")
                                        .fluentPut("billstatus", "B")
@@ -407,6 +407,7 @@
                        String billNo = resultItem.getString("number");  // 获取返回的单据号
                        String billId = resultItem.getString("id");      // 获取返回的ID
                        order.setNumber(billId);
                        order.setShipCode(add.getString("billno"));

                    }
                } else {

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

@@ -101,9 +101,9 @@
                idArray.add(order.getNumber());
                dataObj.fluentPut("ids", idArray);
                return new JSONObject().fluentPut("data", dataObj);
            case "STK_imSaloutbill"://其他入库单
            case "STK_imSaloutbill":
                path = imSaloutbillSaveSubmit;
                idArray.add(order.getOrderNo());
                idArray.add(order.getShipCode());
                dataObj.fluentPut("billno", idArray);
                return new JSONObject().fluentPut("data", dataObj);
            case "STK_MISCELLANEOUS"://其他入库单

 src/main/resources/application.yml

@@ -10,9 +10,9 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
#    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jshdasrs
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jshdasrs
#    url: jdbc:sqlserver://10.10.10.235;databasename=jshdasrs
    url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs
#    url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs
    username: sa
    password: sa@123
  mvc: