From 4313765a9a6ba951abd8b2abcf87462d943cd39c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Fri, 22 Nov 2024 16:05:02 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93=E5=88=97=E8=A1=A8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=A5=E6=BA=90=EF=BC=8C=E8=B0=83=E6=95=B4=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E6=B3=A8=E8=A7=A3=EF=BC=8C=E8=AE=BE=E7=BD=AE=E5=88=97?= =?UTF-8?q?=E5=B1=85=E4=B8=AD=E6=98=BE=E7=A4=BA=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2=E4=B8=BA?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E8=AF=A6=E6=83=85=EF=BC=9B=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=B9=B6=E7=AD=9B=E9=80=89=E7=94=9F=E4=BA=A7=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=85=A5=E5=BA=93=E5=8D=95=E5=88=97=E8=A1=A8controlle?= =?UTF-8?q?r=E6=8E=A5=E5=8F=A3=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ErpInboundOrderController.java | 11 ++- .../erp/inboundOrder/inboundOrder.html | 89 +++++++------------ 2 files changed, 40 insertions(+), 60 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpInboundOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpInboundOrderController.java index 21ed7e6a..2fe3b144 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpInboundOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpInboundOrderController.java @@ -46,6 +46,9 @@ public class ErpInboundOrderController extends BaseController @Autowired private ISysSalesOrderChildService salesOrderChildService; + @Autowired + private IWarehouseStorageOrderService storageOrderService; + @RequiresPermissions("erp:inboundOrder:view") @GetMapping() public String inboundOrder() @@ -59,11 +62,13 @@ public class ErpInboundOrderController extends BaseController @RequiresPermissions("erp:inboundOrder:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(QualityOrder qualityOrder) + public TableDataInfo list(WarehouseStorageOrder storageOrder) { startPage(); - List list = qualityOrderService.selectAllMakeQualityOrderList(qualityOrder); - return getDataTable(list); + List list = storageOrderService.selectWarehouseStorageOrderList(storageOrder); + List filterList = list.stream() + .filter(item -> item.getWarehouseOrderType().equals("1")&&item.getWarehouseStorageType().equals("5")).collect(Collectors.toList()); + return getDataTable(filterList); } /** diff --git a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html index b6ece4df..c4a5ce25 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html +++ b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html @@ -67,8 +67,8 @@ var qualityStatusDatas = [[${@dict.getType('qualityStatus')}]]; - var qualityOrderTypeDatas = [[${@dict.getType('quality_order_type')}]]; - var qualityStorageStatusDatas = [[${@dict.getType('quality_storage_status')}]]; + var warehouseStorageTypeDatas = [[${@dict.getType('warehouse_storage_type')}]]; + var warehouseOrderTypeDatas = [[${@dict.getType('storage_order_type')}]]; var prefix = ctx + "erp/inboundOrder"; @@ -87,115 +87,90 @@ columns: [ {checkbox: true}, { - title: '品质单Id', - field: 'qualityOrderId', + title: '入库单id', + align: 'center', + field: 'warehouseStorageId', visible: false }, { title: '品质单号', + align: 'center', field: 'qualityOrderCode', }, { title: '品质状态', - field: 'qualityStatus', + align: 'center', + field: 'warehouseQualityStatus', formatter: function(value, row, index) { return $.table.selectDictLabel(qualityStatusDatas, value); } }, { title: '入库单号', - field: 'inStorageCode', + align: 'center', + field: 'warehouseStorageCode', }, { title: '关联订单号', + align: 'center', field: 'relatedOrderCode', }, - { title: '订单类型', - field: 'qualityOrderType', + align: 'center', + field: 'warehouseOrderType', formatter: function(value, row, index) { - return $.table.selectDictLabel(qualityOrderTypeDatas, value); + return $.table.selectDictLabel(warehouseOrderTypeDatas, value); } }, { title: '入库类型', - field: 'qualityStorageStatus', + align: 'center', + field: 'warehouseStorageType', formatter: function(value, row, index) { - return $.table.selectDictLabel(qualityStorageStatusDatas, value); + return $.table.selectDictLabel(warehouseStorageTypeDatas, value); } }, - // { - // title: '委内加工费总价', - // field: 'makeInTotalPrice', - // visible: false, - // footerFormatter: function (value) { - // const total = value.reduce((accumulator, currentValue) => { - // // 直接访问makeInTotalPrice，如果它是null或undefined，则使用0 - // const makeInTotalPrice = currentValue.makeInTotalPrice || 0; - // return accumulator + parseFloat(makeInTotalPrice); - // }, 0); - // return total; - // } - // }, - - - // { - // field: 'entrysalary', - // title: '入职薪资', - // sortable: true, - // footerFormatter: function (value) { - // var count = 0; - // console.log(value); - // for (var i=0; i详情 '); + actions.push('详情 '); return actions.join(''); } } @@ -205,11 +180,11 @@ }); - //详情 - function inboundOrderDetail(qualityOrderId){ - var url = prefix +'/inboundOrderDetail/' + qualityOrderId; - $.modal.open("生产入库单详情",url) - } + /*入库-生产订单(生产入库)详情*/ + function storageMakeDetail(warehouseStorageId){ + var url = ctx + 'warehouse/storageOrder/storageMakeDetail/' + warehouseStorageId; + $.modal.open("详情",url); + }; \ No newline at end of file