-
# Conflicts: # .gitignore # .idea/misc.xml # .idea/workspace.xml # huaheng.iml
-
Conflicts: src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java src/main/java/com/huaheng/pc/receipt/receiptHeader/mapper/ReceiptHeaderMapper.java src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java src/main/resources/mybatis/receipt/ReceiptHeaderMapper.xml src/main/resources/templates/config/material/material.html
-
2.加上接口多线程处理
-
增加一些接口
-
# 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