2023-2-22生成产品工序面料辅料

zhc4dev
lenovo 2 years ago
parent 20223679b8
commit b8f10f894a
  1. 171
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/controller/ProductProcessAccessoriesController.java
  2. 69
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/entity/ProductProcessAccessories.java
  3. 19
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/mapper/ProductProcessAccessoriesMapper.java
  4. 5
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/mapper/xml/ProductProcessAccessoriesMapper.xml
  5. 15
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/service/IProductProcessAccessoriesService.java
  6. 19
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/service/impl/ProductProcessAccessoriesServiceImpl.java
  7. 184
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/vue/ProductProcessAccessoriesList.vue
  8. 114
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/vue/modules/ProductProcessAccessoriesForm.vue
  9. 60
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/vue/modules/ProductProcessAccessoriesModal.vue
  10. 84
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessaccessories/vue/modules/ProductProcessAccessoriesModal__Style#Drawer.vue
  11. 173
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/controller/ProductProcessFabricController.java
  12. 68
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/entity/ProductProcessFabric.java
  13. 16
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/mapper/ProductProcessFabricMapper.java
  14. 5
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/mapper/xml/ProductProcessFabricMapper.xml
  15. 14
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/service/IProductProcessFabricService.java
  16. 19
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/service/impl/ProductProcessFabricServiceImpl.java
  17. 184
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/vue/ProductProcessFabricList.vue
  18. 114
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/vue/modules/ProductProcessFabricForm.vue
  19. 60
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/vue/modules/ProductProcessFabricModal.vue
  20. 84
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productprocessfabric/vue/modules/ProductProcessFabricModal__Style#Drawer.vue

@ -0,0 +1,171 @@
package org.jeecg.modules.productprocessaccessories.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.productprocessaccessories.entity.ProductProcessAccessories;
import org.jeecg.modules.productprocessaccessories.service.IProductProcessAccessoriesService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 产品工序辅料管理
* @Author: jeecg-boot
* @Date: 2023-02-22
* @Version: V1.0
*/
@Api(tags="产品工序辅料管理")
@RestController
@RequestMapping("/productprocessaccessories/productProcessAccessories")
@Slf4j
public class ProductProcessAccessoriesController extends JeecgController<ProductProcessAccessories, IProductProcessAccessoriesService> {
@Autowired
private IProductProcessAccessoriesService productProcessAccessoriesService;
/**
* 分页列表查询
*
* @param productProcessAccessories
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "产品工序辅料管理-分页列表查询")
@ApiOperation(value="产品工序辅料管理-分页列表查询", notes="产品工序辅料管理-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(ProductProcessAccessories productProcessAccessories,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ProductProcessAccessories> queryWrapper = QueryGenerator.initQueryWrapper(productProcessAccessories, req.getParameterMap());
Page<ProductProcessAccessories> page = new Page<ProductProcessAccessories>(pageNo, pageSize);
IPage<ProductProcessAccessories> pageList = productProcessAccessoriesService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param productProcessAccessories
* @return
*/
@AutoLog(value = "产品工序辅料管理-添加")
@ApiOperation(value="产品工序辅料管理-添加", notes="产品工序辅料管理-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody ProductProcessAccessories productProcessAccessories) {
productProcessAccessoriesService.save(productProcessAccessories);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param productProcessAccessories
* @return
*/
@AutoLog(value = "产品工序辅料管理-编辑")
@ApiOperation(value="产品工序辅料管理-编辑", notes="产品工序辅料管理-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody ProductProcessAccessories productProcessAccessories) {
productProcessAccessoriesService.updateById(productProcessAccessories);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "产品工序辅料管理-通过id删除")
@ApiOperation(value="产品工序辅料管理-通过id删除", notes="产品工序辅料管理-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
productProcessAccessoriesService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "产品工序辅料管理-批量删除")
@ApiOperation(value="产品工序辅料管理-批量删除", notes="产品工序辅料管理-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.productProcessAccessoriesService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
@AutoLog(value = "产品工序辅料管理-通过id查询")
@ApiOperation(value="产品工序辅料管理-通过id查询", notes="产品工序辅料管理-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
ProductProcessAccessories productProcessAccessories = productProcessAccessoriesService.getById(id);
if(productProcessAccessories==null) {
return Result.error("未找到对应数据");
}
return Result.OK(productProcessAccessories);
}
/**
* 导出excel
*
* @param request
* @param productProcessAccessories
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ProductProcessAccessories productProcessAccessories) {
return super.exportXls(request, productProcessAccessories, ProductProcessAccessories.class, "产品工序辅料管理");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ProductProcessAccessories.class);
}
}

@ -0,0 +1,69 @@
package org.jeecg.modules.productprocessaccessories.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 产品工序辅料管理
* @Author: jeecg-boot
* @Date: 2023-02-22
* @Version: V1.0
*/
@Data
@TableName("product_process_accessories")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="product_process_accessories对象", description="产品工序辅料管理")
public class ProductProcessAccessories implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private Date updateTime;
/**产品工序id*/
@Excel(name = "产品工序id", width = 15)
@ApiModelProperty(value = "产品工序id")
private String productProcessId;
/**辅料id*/
@Excel(name = "辅料id", width = 15)
@ApiModelProperty(value = "辅料id")
@Dict(dictTable = "zy_accessories",dicCode = "id",dicText = "contents")
private String accessoriesId;
/**用量*/
@Excel(name = "用量", width = 15)
@ApiModelProperty(value = "用量")
private Double amount;
}

@ -0,0 +1,19 @@
package org.jeecg.modules.productprocessaccessories.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.productprocessaccessories.entity.ProductProcessAccessories;
/**
* @Description: 产品工序辅料管理
* @Author: jeecg-boot
* @Date: 2023-02-22
* @Version: V1.0
*/
public interface ProductProcessAccessoriesMapper extends BaseMapper<ProductProcessAccessories> {
}

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.productprocessaccessories.mapper.ProductProcessAccessoriesMapper">
</mapper>

@ -0,0 +1,15 @@
package org.jeecg.modules.productprocessaccessories.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.productprocessaccessories.entity.ProductProcessAccessories;
/**
* @Description: 产品工序辅料管理
* @Author: jeecg-boot
* @Date: 2023-02-22
* @Version: V1.0
*/
public interface IProductProcessAccessoriesService extends IService<ProductProcessAccessories> {
}

@ -0,0 +1,19 @@
package org.jeecg.modules.productprocessaccessories.service.impl;
import org.jeecg.modules.productprocessaccessories.entity.ProductProcessAccessories;
import org.jeecg.modules.productprocessaccessories.mapper.ProductProcessAccessoriesMapper;
import org.jeecg.modules.productprocessaccessories.service.IProductProcessAccessoriesService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 产品工序辅料管理
* @Author: jeecg-boot
* @Date: 2023-02-22
* @Version: V1.0
*/
@Service
public class ProductProcessAccessoriesServiceImpl extends ServiceImpl<ProductProcessAccessoriesMapper, ProductProcessAccessories> implements IProductProcessAccessoriesService {
}

@ -0,0 +1,184 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('产品工序辅料管理')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown>
</div>
<!-- table区域-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div>
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
<img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
</div>
<product-process-accessories-modal ref="modalForm" @ok="modalFormOk"></product-process-accessories-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ProductProcessAccessoriesModal from './modules/ProductProcessAccessoriesModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'ProductProcessAccessoriesList',
mixins:[JeecgListMixin, mixinDevice],
components: {
ProductProcessAccessoriesModal
},
data () {
return {
description: '产品工序辅料管理管理页面',
// 表头
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'产品工序id',
align:"center",
dataIndex: 'productProcessId'
},
{
title:'辅料id',
align:"center",
dataIndex: 'accessoriesId'
},
{
title:'用量',
align:"center",
dataIndex: 'amount'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/productprocessaccessories/productProcessAccessories/list",
delete: "/productprocessaccessories/productProcessAccessories/delete",
deleteBatch: "/productprocessaccessories/productProcessAccessories/deleteBatch",
exportXlsUrl: "/productprocessaccessories/productProcessAccessories/exportXls",
importExcelUrl: "productprocessaccessories/productProcessAccessories/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'productProcessId',text:'产品工序id',dictCode:''})
fieldList.push({type:'string',value:'accessoriesId',text:'辅料id',dictCode:'zy_accessories,contents,id'})
fieldList.push({type:'double',value:'amount',text:'用量',dictCode:''})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

@ -0,0 +1,114 @@
<template>
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="产品工序id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productProcessId">
<a-input v-model="model.productProcessId" placeholder="请输入产品工序id" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="辅料id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accessoriesId">
<a-input v-model="model.accessoriesId" placeholder="请输入辅料id" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="用量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="amount">
<a-input-number v-model="model.amount" placeholder="请输入用量" style="width: 100%" />
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>
</a-spin>
</template>
<script>
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
export default {
name: 'ProductProcessAccessoriesForm',
components: {
},
props: {
//表单禁用
disabled: {
type: Boolean,
default: false,
required: false
}
},
data () {
return {
model:{
},
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules: {
},
url: {
add: "/productprocessaccessories/productProcessAccessories/add",
edit: "/productprocessaccessories/productProcessAccessories/edit",
queryById: "/productprocessaccessories/productProcessAccessories/queryById"
}
}
},
computed: {
formDisabled(){
return this.disabled
},
},
created () {
//备份model原始值
this.modelDefault = JSON.parse(JSON.stringify(this.model));
},
methods: {
add () {
this.edit(this.modelDefault);
},
edit (record) {
this.model = Object.assign({}, record);
this.visible = true;
},
submitForm () {
const that = this;
// 触发表单验证
this.$refs.form.validate(valid => {
if (valid) {
that.confirmLoading = true;
let httpurl = '';
let method = '';
if(!this.model.id){
httpurl+=this.url.add;
method = 'post';
}else{
httpurl+=this.url.edit;
method = 'put';
}
httpAction(httpurl,this.model,method).then((res)=>{
if(res.success){
that.$message.success(res.message);
that.$emit('ok');
}else{
that.$message.warning(res.message);
}
}).finally(() => {
that.confirmLoading = false;
})
}
})
},
}
}
</script>

@ -0,0 +1,60 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<product-process-accessories-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></product-process-accessories-form>
</j-modal>
</template>
<script>
import ProductProcessAccessoriesForm from './ProductProcessAccessoriesForm'
export default {
name: 'ProductProcessAccessoriesModal',
components: {
ProductProcessAccessoriesForm
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

@ -0,0 +1,84 @@
<template>
<a-drawer
:title="title"
:width="width"
placement="right"
:closable="false"
@close="close"
destroyOnClose
:visible="visible">
<product-process-accessories-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></product-process-accessories-form>
<div class="drawer-footer">
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
</div>
</a-drawer>
</template>
<script>
import ProductProcessAccessoriesForm from './ProductProcessAccessoriesForm'
export default {
name: 'ProductProcessAccessoriesModal',
components: {
ProductProcessAccessoriesForm
},
data () {
return {
title:"操作",
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
});
},
close () {
this.$emit('close');
this.visible = false;
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
handleCancel () {
this.close()
}
}
}
</script>
<style lang="less" scoped>
/** Button按钮间距 */
.ant-btn {
margin-left: 30px;
margin-bottom: 30px;
float: right;
}
.drawer-footer{
position: absolute;
bottom: -8px;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
</style>

@ -0,0 +1,173 @@
package org.jeecg.modules.productprocessfabric.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.productprocessfabric.entity.ProductProcessFabric;
import org.jeecg.modules.productprocessfabric.service.IProductProcessFabricService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 产品工序面料管理
* @Author: jeecg-boot
* @Date: 2023-02-22
* @Version: V1.0
*/
@Api(tags="产品工序面料管理")
@RestController
@RequestMapping("/productprocessfabric/productProcessFabric")
@Slf4j
public class ProductProcessFabricController extends JeecgController<ProductProcessFabric, IProductProcessFabricService> {
@Autowired
private IProductProcessFabricService productProcessFabricService;
/**
* 分页列表查询
*
* @param productProcessFabric
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "产品工序面料管理-分页列表查询")
@ApiOperation(value="产品工序面料管理-分页列表查询", notes="产品工序面料管理-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(ProductProcessFabric productProcessFabric,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ProductProcessFabric> queryWrapper = QueryGenerator.initQueryWrapper(productProcessFabric, req.getParameterMap());
Page<ProductProcessFabric> page = new Page<ProductProcessFabric>(pageNo, pageSize);
IPage<ProductProcessFabric> pageList = productProcessFabricService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param productProcessFabric
* @return
*/
@AutoLog(value = "产品工序面料管理-添加")
@ApiOperation(value="产品工序面料管理-添加", notes="产品工序面料管理-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody ProductProcessFabric productProcessFabric) {
productProcessFabricService.save(productProcessFabric);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param productProcessFabric
* @return
*/
@AutoLog(value = "产品工序面料管理-编辑")
@ApiOperation(value="产品工序面料管理-编辑", notes="产品工序面料管理-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody ProductProcessFabric productProcessFabric) {
productProcessFabricService.updateById(productProcessFabric);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "产品工序面料管理-通过id删除")
@ApiOperation(value="产品工序面料管理-通过id删除", notes="产品工序面料管理-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
productProcessFabricService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "产品工序面料管理-批量删除")
@ApiOperation(value="产品工序面料管理-批量删除", notes="产品工序面料管理-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.productProcessFabricService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
@AutoLog(value = "产品工序面料管理-通过id查询")
@ApiOperation(value="产品工序面料管理-通过id查询", notes="产品工序面料管理-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
ProductProcessFabric productProcessFabric = productProcessFabricService.getById(id);
if(productProcessFabric==null) {
return Result.error("未找到对应数据");
}
return Result.OK(productProcessFabric);
}
/**
* 导出excel
*
* @param request
* @param productProcessFabric
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ProductProcessFabric productProcessFabric) {
return super.exportXls(request, productProcessFabric, ProductProcessFabric.class, "产品工序面料管理");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, ProductProcessFabric.class);
}
}

@ -0,0 +1,68 @@
package org.jeecg.modules.productprocessfabric.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 产品工序面料管理
* @Author: jeecg-boot
* @Date: 2023-02-22
* @Version: V1.0
*/
@Data
@TableName("product_process_fabric")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="product_process_fabric对象", description="产品工序面料管理")
public class ProductProcessFabric implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private Date updateTime;
/**产品工序id*/
@Excel(name = "产品工序id", width = 15)
@ApiModelProperty(value = "产品工序id")
private String productProcessId;
/**面料id*/
@Excel(name = "面料id", width = 15)
@ApiModelProperty(value = "面料id")
private String fabricId;
/**用量*/
@Excel(name = "用量", width = 15)
@ApiModelProperty(value = "用量")
private Double amount;
}

@ -0,0 +1,16 @@
package org.jeecg.modules.productprocessfabric.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.productprocessfabric.entity.ProductProcessFabric;
/**
* @Description: 产品工序面料管理
* @Author: jeecg-boot
* @Date: 2023-02-22
* @Version: V1.0
*/
public interface ProductProcessFabricMapper extends BaseMapper<ProductProcessFabric> {
}

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.productprocessfabric.mapper.ProductProcessFabricMapper">
</mapper>

@ -0,0 +1,14 @@
package org.jeecg.modules.productprocessfabric.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.productprocessfabric.entity.ProductProcessFabric;
/**
* @Description: 产品工序面料管理
* @Author: jeecg-boot
* @Date: 2023-02-22
* @Version: V1.0
*/
public interface IProductProcessFabricService extends IService<ProductProcessFabric> {
}

@ -0,0 +1,19 @@
package org.jeecg.modules.productprocessfabric.service.impl;
import org.jeecg.modules.productprocessfabric.entity.ProductProcessFabric;
import org.jeecg.modules.productprocessfabric.mapper.ProductProcessFabricMapper;
import org.jeecg.modules.productprocessfabric.service.IProductProcessFabricService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 产品工序面料管理
* @Author: jeecg-boot
* @Date: 2023-02-22
* @Version: V1.0
*/
@Service
public class ProductProcessFabricServiceImpl extends ServiceImpl<ProductProcessFabricMapper, ProductProcessFabric> implements IProductProcessFabricService {
}

@ -0,0 +1,184 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('产品工序面料管理')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown>
</div>
<!-- table区域-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div>
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
<img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
</div>
<product-process-fabric-modal ref="modalForm" @ok="modalFormOk"></product-process-fabric-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ProductProcessFabricModal from './modules/ProductProcessFabricModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'ProductProcessFabricList',
mixins:[JeecgListMixin, mixinDevice],
components: {
ProductProcessFabricModal
},
data () {
return {
description: '产品工序面料管理管理页面',
// 表头
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'产品工序id',
align:"center",
dataIndex: 'productProcessId'
},
{
title:'面料id',
align:"center",
dataIndex: 'fabricId'
},
{
title:'用量',
align:"center",
dataIndex: 'amount'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/productprocessfabric/productProcessFabric/list",
delete: "/productprocessfabric/productProcessFabric/delete",
deleteBatch: "/productprocessfabric/productProcessFabric/deleteBatch",
exportXlsUrl: "/productprocessfabric/productProcessFabric/exportXls",
importExcelUrl: "productprocessfabric/productProcessFabric/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'productProcessId',text:'产品工序id',dictCode:''})
fieldList.push({type:'string',value:'fabricId',text:'面料id',dictCode:'zy_fabric,name,id'})
fieldList.push({type:'double',value:'amount',text:'用量',dictCode:''})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

@ -0,0 +1,114 @@
<template>
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="产品工序id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productProcessId">
<a-input v-model="model.productProcessId" placeholder="请输入产品工序id" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="面料id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fabricId">
<a-input v-model="model.fabricId" placeholder="请输入面料id" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="用量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="amount">
<a-input-number v-model="model.amount" placeholder="请输入用量" style="width: 100%" />
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>
</a-spin>
</template>
<script>
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
export default {
name: 'ProductProcessFabricForm',
components: {
},
props: {
//表单禁用
disabled: {
type: Boolean,
default: false,
required: false
}
},
data () {
return {
model:{
},
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules: {
},
url: {
add: "/productprocessfabric/productProcessFabric/add",
edit: "/productprocessfabric/productProcessFabric/edit",
queryById: "/productprocessfabric/productProcessFabric/queryById"
}
}
},
computed: {
formDisabled(){
return this.disabled
},
},
created () {
//备份model原始值
this.modelDefault = JSON.parse(JSON.stringify(this.model));
},
methods: {
add () {
this.edit(this.modelDefault);
},
edit (record) {
this.model = Object.assign({}, record);
this.visible = true;
},
submitForm () {
const that = this;
// 触发表单验证
this.$refs.form.validate(valid => {
if (valid) {
that.confirmLoading = true;
let httpurl = '';
let method = '';
if(!this.model.id){
httpurl+=this.url.add;
method = 'post';
}else{
httpurl+=this.url.edit;
method = 'put';
}
httpAction(httpurl,this.model,method).then((res)=>{
if(res.success){
that.$message.success(res.message);
that.$emit('ok');
}else{
that.$message.warning(res.message);
}
}).finally(() => {
that.confirmLoading = false;
})
}
})
},
}
}
</script>

@ -0,0 +1,60 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<product-process-fabric-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></product-process-fabric-form>
</j-modal>
</template>
<script>
import ProductProcessFabricForm from './ProductProcessFabricForm'
export default {
name: 'ProductProcessFabricModal',
components: {
ProductProcessFabricForm
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

@ -0,0 +1,84 @@
<template>
<a-drawer
:title="title"
:width="width"
placement="right"
:closable="false"
@close="close"
destroyOnClose
:visible="visible">
<product-process-fabric-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></product-process-fabric-form>
<div class="drawer-footer">
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
</div>
</a-drawer>
</template>
<script>
import ProductProcessFabricForm from './ProductProcessFabricForm'
export default {
name: 'ProductProcessFabricModal',
components: {
ProductProcessFabricForm
},
data () {
return {
title:"操作",
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
});
},
close () {
this.$emit('close');
this.visible = false;
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
handleCancel () {
this.close()
}
}
}
</script>
<style lang="less" scoped>
/** Button按钮间距 */
.ant-btn {
margin-left: 30px;
margin-bottom: 30px;
float: right;
}
.drawer-footer{
position: absolute;
bottom: -8px;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
</style>
Loading…
Cancel
Save