-
2.修改出库组盘，增加出库单编号，生成任务的时候，将出库单id，编码，明细id都插入到任务明细中 3.修改taskdetail，将物料名称添加进任务明细
-
生成任务及锁定库位改成成无， 移库的库位锁定解锁做成sql解决。
-
# Conflicts: # src/main/java/com/huaheng/pc/task/task/service/ITaskService.java # src/main/resources/templates/receipt/receiving/add.html
-
# Conflicts: # src/main/java/com/huaheng/pc/general/company/mapper/CompanyMapper.java # src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java # src/main/resources/mybatis/general/CompanyMapper.xml # src/main/resources/templates/shipment/shipmentHeader/add.html 修改货主bug，将文本框改为下拉框，彻底完善货主部分
-
# Conflicts: # src/main/java/com/huaheng/pc/inventory/inventory/mapper/InventoryMapper.java # src/main/resources/mybatis/inventory/InventoryMapper.xml # src/main/resources/templates/shipment/shipmentContainerHeader/shipmentContainerHeader.html 修改货主表单的bug
-
# Conflicts: # src/main/resources/templates/general/customer/customer.html