-
2.修改入库的验证，取消是否有任务的验证，因为出库组盘改为锁定库位了 3.修改出库组盘，增加锁定库位
-
2.修改配置文件从YML到properties，方便编辑 3.修改库区容量页面报错问题 4.修改出入库，将主表和明细关联起来
-
# Conflicts: # src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java # src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/IShipmentHeaderService.java # src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java
-
# Conflicts: # .idea/misc.xml # src/main/java/com/huaheng/pc/task/task/service/TaskServiceImpl.java