Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

1

14 小时以前 2561f81f2c28480502f51775e618bceeb053644c

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

@@ -63,6 +63,9 @@
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;

    @Autowired
    private LocOwnerService locOwnerService;

    @Transactional
    public synchronized ReturnT<String> start() {
        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -175,6 +178,12 @@
                        docType.setCreateTime(jsonDate);
                        Order order = OrderInAndOutUtil.selectByNo(kingDeeUtilType.pakIn == 1, jsonArray.get(0).toString());
//                        Order order = orderService.selectByNo(jsonArray.get(0).toString());
                        LocOwner locOwner = null;
                        if (!Cools.isEmpty(1)) {
                            locOwner = locOwnerService.selectById(1);
                        } else {
                            locOwner = locOwnerService.selectById(1);
                        }
                        if (Cools.isEmpty(order)) {
                            Date now = new Date();
                            // 单据主档
@@ -184,12 +193,12 @@
                                    DateUtils.convert(now),    // 单据日期
                                    docType.getDocId(),    // 单据类型
                                    null,    // 项目编号
                                    null,    //
                                    "1",    //项目名称 客户PO号
                                    null,    // 调拨项目编号
                                    null,    // 初始票据号
                                    null,    // 票据号
                                    null,    // 客户编号
                                    null,    // 客户
                                    locOwner.getOwnerUuid(),    // 客户编号
                                    locOwner.getOwner(),    // 客户
                                    null,    // 联系方式
                                    null,    // 操作人员
                                    null,    // 合计金额