-
# Conflicts: # src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleServiceImpl.java # src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationService.java # src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java # src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java # src/main/java/com/huaheng/pc/config/container/service/ContainerService.java # src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java # src/main/java/com/huaheng/pc/config/location/service/LocationService.java # src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java # src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java # src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java
-
2.入库一些问题修复
-
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/mobile/receipt/MobileOneByOneReceiptController.java # src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderService.java # src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
