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 8fa17492..c8ec9e28 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 @@ -280,7 +280,7 @@ public class WarehouseStorageOrderController extends BaseController /** * 修改保存入库-生产订单(生产入库) */ - @RequiresPermissions("warehouse:storageOrder:storagePurchaseWarehouse") + @RequiresPermissions("warehouse:storageOrder:storageMake") @Log(title = "仓库入库单", businessType = BusinessType.UPDATE) @PostMapping("/storageMake") @ResponseBody @@ -301,4 +301,40 @@ public class WarehouseStorageOrderController extends BaseController return groupedDetails; } + + /** + * 入库-生产订单(委内入库) + */ + @GetMapping("/storageMakeIn/{warehouseStorageId}") + public String storageMakeIn(@PathVariable("warehouseStorageId") Long warehouseStorageId, ModelMap mmap) + { + WarehouseStorageOrder warehouseStorageOrder = warehouseStorageOrderService.selectWarehouseStorageOrderById(warehouseStorageId); + mmap.put("warehouseStorageOrder", warehouseStorageOrder); + return prefix + "/storageMakeIn"; + } + + /** + * 修改保存入库-生产订单(委内入库) + */ + @RequiresPermissions("warehouse:storageOrder:storageMakeIn") + @Log(title = "仓库入库单", businessType = BusinessType.UPDATE) + @PostMapping("/storageMakeIn") + @ResponseBody + public AjaxResult storageMakeInSave(@RequestBody WarehouseStorageOrder warehouseStorageOrder) + { + return toAjax(warehouseStorageOrderService.updateStorageMake(warehouseStorageOrder)); + } + + + /** + * 入库-生产订单(委内入库) 客户物料详情列表 + */ + @ResponseBody + @RequestMapping("/storageMakeInDetail") + public Map> storageMakeInDetail(String warehouseStorageCode){ + List allDetails = storageOrderDetailService.selectStorageOrderDetailListByCode(warehouseStorageCode); + Map> groupedDetails = allDetails.stream().collect(Collectors.groupingBy(WarehouseStorageOrderDetail::getCustomerId)); + return groupedDetails; + } + } diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeIn.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeIn.html new file mode 100644 index 00000000..ffece872 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeIn.html @@ -0,0 +1,343 @@ + + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+
+
+
+
+ + + + + + \ 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 f4b5258f..6537b876 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html @@ -80,6 +80,8 @@ var storagePurchaseFlag = [[${@permission.hasPermi('warehouse:storageOrder:storagePurchase')}]]; var storagePurchaseWarehouseFlag = [[${@permission.hasPermi('warehouse:storageOrder:storagePurchaseWarehouse')}]]; var storageMakeFlag = [[${@permission.hasPermi('warehouse:storageOrder:storageMake')}]]; + var storageMakeInFlag = [[${@permission.hasPermi('warehouse:storageOrder:storageMakeIn')}]]; + var warehouseStorageStatusDatas = [[${@dict.getType('warehouse_storage_status')}]]; var warehouseQualityStatusDatas = [[${@dict.getType('warehouse_quality_status')}]]; @@ -246,9 +248,13 @@ actions.push('入库 '); } /*入库-生产订单(生产入库)*/ - if ( row.warehouseDeptType == 1 && row.warehouseOrderType == 1 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){ + if ( row.warehouseStorageType == 5 && row.warehouseDeptType == 1 && row.warehouseOrderType == 1 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){ actions.push('入库 '); } + /*入库-生产订单(委内入库)*/ + if ( row.warehouseStorageType == 2 && row.warehouseDeptType == 1 && row.warehouseOrderType == 1 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){ + actions.push('入库 '); + } return actions.join(''); } }] @@ -286,6 +292,12 @@ $.modal.open("入库",url); }; + /*入库-生产订单(委内入库)*/ + function storageMakeIn(warehouseStorageId){ + var url = ctx + 'warehouse/storageOrder/storageMakeIn/' + warehouseStorageId; + $.modal.open("入库",url); + }; + \ No newline at end of file