diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java index f7935216..5ad364e4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java @@ -361,6 +361,31 @@ public class WarehouseStorageOrderController extends BaseController } + + /** + * 入库-生产订单(生产入库) + */ + @GetMapping("/storageMakeDetail/{warehouseStorageId}") + public String storageMakeDetail(@PathVariable("warehouseStorageId") Long warehouseStorageId, ModelMap mmap) + { + WarehouseStorageOrder warehouseStorageOrder = warehouseStorageOrderService.selectWarehouseStorageOrderById(warehouseStorageId); + mmap.put("warehouseStorageOrder", warehouseStorageOrder); + return prefix + "/storageMakeDetail"; + } + + /** + * 修改保存入库-生产订单(生产入库) + */ + @RequiresPermissions("warehouse:storageOrder:storageMakeDetail") + @Log(title = "仓库入库单", businessType = BusinessType.UPDATE) + @PostMapping("/storageMakeDetail") + @ResponseBody + public AjaxResult storageMakeDetailSave(@RequestBody WarehouseStorageOrder warehouseStorageOrder) + { + return toAjax(warehouseStorageOrderService.updateStorageMake(warehouseStorageOrder)); + } + + /** * 入库-生产订单(生产入库) 客户物料详情列表 */ diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html new file mode 100644 index 00000000..9a4f41da --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html @@ -0,0 +1,332 @@ + + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+
+
+
+
+ + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html index a69ad82d..3b087079 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html @@ -78,16 +78,16 @@ var temporaryPurchaseWarehouseFlag = [[${@permission.hasPermi('warehouse:storageOrder:temporaryPurchaseWarehouse')}]]; var temporaryPurchaseFlag = [[${@permission.hasPermi('warehouse:storageOrder:temporaryPurchase')}]]; var temporaryOutOrderFlag = [[${@permission.hasPermi('warehouse:storageOrder:temporaryOutOrder')}]]; - var storagePurchaseFlag = [[${@permission.hasPermi('warehouse:storageOrder:storagePurchase')}]]; var storagePurchaseWarehouseFlag = [[${@permission.hasPermi('warehouse:storageOrder:storagePurchaseWarehouse')}]]; var storageOutOrderFlag = [[${@permission.hasPermi('warehouse:storageOrder:storageOutOrder')}]]; - var storageMakeFlag = [[${@permission.hasPermi('warehouse:storageOrder:storageMake')}]]; var storageMakeInFlag = [[${@permission.hasPermi('warehouse:storageOrder:storageMakeIn')}]]; var storageRefundsExchangesFlag = [[${@permission.hasPermi('warehouse:storageOrder:storageRefundsExchanges')}]]; + var storageMakeDetailFlag = [[${@permission.hasPermi('warehouse:storageOrder:storageMakeDetail')}]]; + var warehouseStorageStatusDatas = [[${@dict.getType('warehouse_storage_status')}]]; var warehouseQualityStatusDatas = [[${@dict.getType('warehouse_quality_status')}]]; var warehouseStorageTypeDatas = [[${@dict.getType('warehouse_storage_type')}]]; @@ -264,6 +264,8 @@ /*入库-生产订单(生产入库)*/ if ( row.warehouseStorageType == 5 && row.warehouseDeptType == 1 && row.warehouseOrderType == 1 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){ actions.push('入库 '); + actions.push('详情 '); + } /*入库-生产订单(委内入库)*/ if ( row.warehouseStorageType == 2 && row.warehouseDeptType == 1 && row.warehouseOrderType == 1 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){ @@ -317,6 +319,12 @@ $.modal.open("入库",url); }; + /*入库-生产订单(生产入库)详情*/ + function storageMakeDetail(warehouseStorageId){ + var url = ctx + 'warehouse/storageOrder/storageMakeDetail/' + warehouseStorageId; + $.modal.open("详情",url); + }; + /*入库-委外单*/ function storageOutOrder(warehouseStorageId){ var url = ctx + 'warehouse/storageOrder/storageOutOrder/' + warehouseStorageId;