-
# Conflicts: # src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java # src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptHeader.java # src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java # src/main/java/com/huaheng/pc/u8/service/ICSReceiptAPIService.java
-
使用reference_code关联。
-
# Conflicts: # src/main/java/com/huaheng/pc/u8/service/ICSReceiptAPIService.java
-
IDocumentWarningService 添加 下发/回传 单据失败日志
-
# Conflicts: # src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java # src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java # src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
-
# Conflicts: # src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java # src/main/java/com/huaheng/pc/config/warehouse/mapper/WarehouseMapper.java # src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java # src/main/java/com/huaheng/pc/shipment/shipmentDetail/mapper/ShipmentDetailMapper.java # src/main/java/com/huaheng/pc/shipment/shipmentDetail/service/ShipmentDetailService.java # src/main/java/com/huaheng/pc/shipment/shipmentDetail/service/ShipmentDetailServiceImpl.java # src/main/resources/mybatis/config/WarehouseMapper.xml # src/main/resources/mybatis/shipment/ShipmentDetailMapper.xml # src/main/resources/templates/config/carrier/carrier.html # src/main/resources/templates/config/company/company.html # src/main/resources/templates/config/configValue/configValue.html # src/main/resources/templates/config/customer/customer.html # src/main/resources/templates/config/statusFlowHeader/statusFlowHeader.html # src/main/resources/templates/config/supplier/supplier.html # src/main/resources/templates/system/config/config.html
