root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[feat] 

生产管理 生产入库
修改生产入库列表页面，修改表格数据来源，调整表格字段，添加字典注解，设置列居中显示，修改详情跳转页面为入库单详情；
新增生产入库获取并筛选生产类型入库单列表controller接口；
dev
王晓迪 3 days ago
parent
b09f12d210
commit
4313765a9a
2 changed files with 40 additions and 60 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpInboundOrderController.java
  2. 89
      ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html

11
ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpInboundOrderController.java
View File

@ -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<QualityOrder> list = qualityOrderService.selectAllMakeQualityOrderList(qualityOrder);
return getDataTable(list);
List<WarehouseStorageOrder> list = storageOrderService.selectWarehouseStorageOrderList(storageOrder);
List<WarehouseStorageOrder> filterList = list.stream()
.filter(item -> item.getWarehouseOrderType().equals("1")&&item.getWarehouseStorageType().equals("5")).collect(Collectors.toList());
return getDataTable(filterList);
}
/**

89
ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html
View File

@ -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<value.length;i++) {
// count += parseFloat(JSON.parse(JSON.stringify(value[i])).entrysalary);
// }
// return count;
// }
// },
{
title: '品质合格数',
align: 'center',
field: 'qualityQualifiedNum',
},
{
title: '品质不合格数',
align: 'center',
field: 'qualityUnqualifiedNum',
},
{
title: '入库数',
align: 'center',
field: 'storageNum',
},
// {
// title: '交检时间',
// field: 'deliveryInspectionTime',
// },
// {
// title: '品质员',
// field: 'qualityEmployee',
// },
{
title: '录入人',
align: 'center',
field: 'createBy',
},
{
title: '录入时间',
align: 'center',
field: 'createTime',
},
{
title: '更新人',
align: 'center',
field: 'updateBy',
},
{
title: '上次更新时间',
align: 'center',
field: 'updateTime',
},
{title: '操作', align: 'center',formatter: function(value, row, index) {
{
title: '操作', align: 'center',formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="inboundOrderDetail(\'' + row.qualityOrderId + '\')"><i class="fa fa-edit"></i>详情</a> ');
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="storageMakeDetail(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>详情</a> ');
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);
};
</script>
</body>
</html>
Write Preview
Loading…
Cancel
Save