Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

Junjie

2023-12-06 828b592b5f8e31204f93bcc2ea0c5866bdc0dcf0

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

@@ -740,9 +740,9 @@
        order.setOrderNo(toString(param.get("id")));
        //业务类型
        //order.setDefNumber(param.get("cBusType").toString());
        order.setDefNumber(toString(param.get("cBusType")));
        order.setDefNumber(toString(param.get("cVouchType")));
        //单据类型
        DocType docType = docTypeService.selectOrAdd(param.get("cVouchType").toString(), pakin);
        DocType docType = docTypeService.selectOrAdd(param.get("cBusType").toString(), pakin);
        order.setDocType(docType.getDocId());
        //单据日期
        //order.setOrderTime(param.get("dDate").toString());