-
2
-
4
-
Signed-off-by: TanYibin <5491541@qq.com>
-
Signed-off-by: TanYibin <5491541@qq.com>
-
2
-
Signed-off-by: TanYibin <5491541@qq.com>
-
Signed-off-by: TanYibin <5491541@qq.com>
-
Conflicts: ant-design-vue-jeecg/src/views/system/inventory/InventoryMaterialSummaryList.vue huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/IReceiptDetailService.java huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptDetailServiceImpl.java huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/service/impl/ReceiptHeaderHistoryServiceImpl.java huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
-
into develop Conflicts: ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue
-
Signed-off-by: TanYibin <5491541@qq.com>
-
# Conflicts: # ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue # huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java # huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptDetailServiceImpl.java
-
Signed-off-by: TanYibin <5491541@qq.com>
-
# Conflicts: # huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java # huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/entity/ShipmentDetail.java
-
Signed-off-by: TanYibin <5491541@qq.com>
-
Signed-off-by: TanYibin <5491541@qq.com>