-
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. 解决入库的一些bug
-
# 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
-
2. 取消任务要解锁托盘 3. 修正一些接口名字
-
# Conflicts: # src/main/resources/application-druid.properties
-
# 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
-
添加入库明细中判断入库流程
-
修改任务完成不修改入库组盘状态的问题