-
# 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
-
2.修改收货接口，增加 "新增收货页面"的控制器 3.修改入库单的明细，删除一些不要的字段，将整个表单序列化提交改为组织成json提交
-
分盘分表单还有问题
-
# 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