-
# Conflicts: # src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/domain/ReceiptContainerHeader.java # src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java # src/main/java/com/huaheng/pc/receipt/receiptDetail/domain/ReceiptDetail.java # src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentContainerHeader.java # src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java # src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java # src/main/java/com/huaheng/pc/task/task/service/TaskServiceImpl.java # src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java # src/main/resources/mybatis/receipt/ReceiptDetailMapperAuto.xml # src/main/resources/mybatis/shipment/ShipmentDetailMapperAuto.xml # src/main/resources/mybatis/task/TaskMapper.xml # src/main/resources/templates/receipt/receiptHeader/receiptHeader.html # src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
-
# Conflicts: # src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/domain/ReceiptContainerHeader.java # src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java # src/main/java/com/huaheng/pc/receipt/receiptDetail/domain/ReceiptDetail.java # src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentContainerHeader.java # src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java # src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java # src/main/java/com/huaheng/pc/task/task/service/TaskServiceImpl.java # src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java # src/main/resources/mybatis/receipt/ReceiptDetailMapperAuto.xml # src/main/resources/mybatis/shipment/ShipmentDetailMapperAuto.xml # src/main/resources/mybatis/task/TaskMapper.xml # src/main/resources/templates/receipt/receiptHeader/receiptHeader.html # src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
-
2.修改出库组盘，增加出库单编号，生成任务的时候，将出库单id，编码，明细id都插入到任务明细中 3.修改taskdetail，将物料名称添加进任务明细
-
# Conflicts: # src/main/java/com/huaheng/pc/task/task/service/TaskServiceImpl.java
-
生成任务及锁定库位改成成无， 移库的库位锁定解锁做成sql解决。
-
2.修改入库的验证，取消是否有任务的验证，因为出库组盘改为锁定库位了 3.修改出库组盘，增加锁定库位
-
# Conflicts: # src/main/resources/templates/general/customer/customer.html
-
# Conflicts: # src/main/resources/templates/general/customer/customer.html