品质

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/entity/FbsAbnormalWorkingHours.java

@@ -142,6 +142,12 @@ public class FbsAbnormalWorkingHours implements Serializable {
 	/**生产线id*/
 	@Excel(name = "生产线id", width = 15)
 	private String productionLineId;
+	/**应到人数*/
+	private Integer numberOfPeopleToArrive;
+	/**实到人数*/
+	private Integer actualNumberOfPeople;
+	/**出勤工时*/
+	private Integer attendanceHours;
 
 	//异常工时描述集合
 	@TableField(exist = false)

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/entity/FbsAbnormalWorkingHoursDescribe.java

@@ -76,6 +76,15 @@ public class FbsAbnormalWorkingHoursDescribe implements Serializable {
 	private String typeId;
 	//类型名称
 	private String typeName;
+	/**产品*/
+	@Excel(name = "产品", width = 15)
+	private String product;/**产品id*/
+	@Excel(name = "产品id", width = 15)
+	private String productId;
+	@Excel(name = "派工单id", width = 15)
+	private String workshopDispatchListId;
+	@Excel(name = "不良品数量", width = 15)
+	private String rejectsNumber;
 
 	//异常分类总数
 	@TableField(exist = false)

src/main/java/org/jeecg/modules/fbsBasedate/controller/FbsPersonnelController.java

@@ -0,0 +1,237 @@
+package org.jeecg.modules.fbsBasedate.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+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 org.jeecg.modules.fbsBasedate.entity.FbsPersonnel;
+import org.jeecg.modules.fbsBasedate.service.IFbsPersonnelService;
+
+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.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.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;
+
+ /**
+ * @Title: Controller
+ * @Description: 人员档案
+ * @author： jeecg-boot
+ * @date：   2020-11-10
+ * @version： V1.0
+ */
+@RestController
+@RequestMapping("/fbsBasedate/fbsPersonnel")
+@Slf4j
+public class FbsPersonnelController {
+	@Autowired
+	private IFbsPersonnelService fbsPersonnelService;
+	
+	/**
+	  * 分页列表查询
+	 * @param fbsPersonnel
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@GetMapping(value = "/list")
+	public Result<IPage<FbsPersonnel>> queryPageList(FbsPersonnel fbsPersonnel,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<FbsPersonnel>> result = new Result<IPage<FbsPersonnel>>();
+		QueryWrapper<FbsPersonnel> queryWrapper = QueryGenerator.initQueryWrapper(fbsPersonnel, req.getParameterMap());
+		Page<FbsPersonnel> page = new Page<FbsPersonnel>(pageNo, pageSize);
+		IPage<FbsPersonnel> pageList = fbsPersonnelService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param fbsPersonnel
+	 * @return
+	 */
+	@PostMapping(value = "/add")
+	public Result<FbsPersonnel> add(@RequestBody FbsPersonnel fbsPersonnel) {
+		Result<FbsPersonnel> result = new Result<FbsPersonnel>();
+		try {
+			fbsPersonnelService.save(fbsPersonnel);
+			result.success("添加成功！");
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.info(e.getMessage());
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param fbsPersonnel
+	 * @return
+	 */
+	@PutMapping(value = "/edit")
+	public Result<FbsPersonnel> edit(@RequestBody FbsPersonnel fbsPersonnel) {
+		Result<FbsPersonnel> result = new Result<FbsPersonnel>();
+		FbsPersonnel fbsPersonnelEntity = fbsPersonnelService.getById(fbsPersonnel.getId());
+		if(fbsPersonnelEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsPersonnelService.updateById(fbsPersonnel);
+			//TODO 返回false说明什么？
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@DeleteMapping(value = "/delete")
+	public Result<FbsPersonnel> delete(@RequestParam(name="id",required=true) String id) {
+		Result<FbsPersonnel> result = new Result<FbsPersonnel>();
+		FbsPersonnel fbsPersonnel = fbsPersonnelService.getById(id);
+		if(fbsPersonnel==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsPersonnelService.removeById(id);
+			if(ok) {
+				result.success("删除成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<FbsPersonnel> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<FbsPersonnel> result = new Result<FbsPersonnel>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别！");
+		}else {
+			this.fbsPersonnelService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@GetMapping(value = "/queryById")
+	public Result<FbsPersonnel> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<FbsPersonnel> result = new Result<FbsPersonnel>();
+		FbsPersonnel fbsPersonnel = fbsPersonnelService.getById(id);
+		if(fbsPersonnel==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(fbsPersonnel);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<FbsPersonnel> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              FbsPersonnel fbsPersonnel = JSON.parseObject(deString, FbsPersonnel.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(fbsPersonnel, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<FbsPersonnel> pageList = fbsPersonnelService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "人员档案列表");
+      mv.addObject(NormalExcelConstants.CLASS, FbsPersonnel.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("人员档案列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+  }
+
+  /**
+      * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          MultipartFile file = entity.getValue();// 获取上传文件对象
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<FbsPersonnel> listFbsPersonnels = ExcelImportUtil.importExcel(file.getInputStream(), FbsPersonnel.class, params);
+              for (FbsPersonnel fbsPersonnelExcel : listFbsPersonnels) {
+                  fbsPersonnelService.save(fbsPersonnelExcel);
+              }
+              return Result.ok("文件导入成功！数据行数：" + listFbsPersonnels.size());
+          } catch (Exception e) {
+              log.error(e.getMessage());
+              return Result.error("文件导入失败！");
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败！");
+  }
+
+}

src/main/java/org/jeecg/modules/fbsBasedate/entity/FbsPersonnel.java

@@ -0,0 +1,73 @@
+package org.jeecg.modules.fbsBasedate.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+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;
+
+/**
+ * @Description: 人员档案
+ * @author： jeecg-boot
+ * @date：   2020-11-10
+ * @version： V1.0
+ */
+@Data
+@TableName("fbs_personnel")
+public class FbsPersonnel implements Serializable {
+    private static final long serialVersionUID = 1L;
+    
+	/**主键*/
+	@TableId(type = IdType.UUID)
+	private String id;
+	/**人员编码*/
+	@Excel(name = "人员编码", width = 15)
+	private String personnelCode;
+	/**人员名称*/
+	@Excel(name = "人员名称", width = 15)
+	private String personnelName;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+	private String memo;
+	/**删除标记0正常1删除*/
+	@Excel(name = "删除标记0正常1删除", width = 15)
+	private String delFlag;
+	/**创建人*/
+	@Excel(name = "创建人", width = 15)
+	private String createBy;
+	/**创建时间*/
+	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+	/**最后修改人*/
+	@Excel(name = "最后修改人", width = 15)
+	private String updateBy;
+	/**最后修改时间*/
+	@Excel(name = "最后修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
+	/**自定义字段1*/
+	@Excel(name = "自定义字段1", width = 15)
+	private String def1;
+	/**自定义字段2*/
+	@Excel(name = "自定义字段2", width = 15)
+	private String def2;
+	/**自定义字段3*/
+	@Excel(name = "自定义字段3", width = 15)
+	private String def3;
+	/**自定义字段4*/
+	@Excel(name = "自定义字段4", width = 15)
+	private String def4;
+	/**自定义字段5*/
+	@Excel(name = "自定义字段5", width = 15)
+	private String def5;
+	/**排序*/
+	@Excel(name = "排序", width = 15)
+	private Integer sort;
+}

src/main/java/org/jeecg/modules/fbsBasedate/mapper/FbsPersonnelMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.fbsBasedate.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.fbsBasedate.entity.FbsPersonnel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 人员档案
+ * @author： jeecg-boot
+ * @date：   2020-11-10
+ * @version： V1.0
+ */
+public interface FbsPersonnelMapper extends BaseMapper<FbsPersonnel> {
+
+}

src/main/java/org/jeecg/modules/fbsBasedate/mapper/xml/FbsPersonnelMapper.xml

@@ -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.fbsBasedate.mapper.FbsPersonnelMapper">
+
+</mapper>

src/main/java/org/jeecg/modules/fbsBasedate/service/IFbsPersonnelService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.fbsBasedate.service;
+
+import org.jeecg.modules.fbsBasedate.entity.FbsPersonnel;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 人员档案
+ * @author： jeecg-boot
+ * @date：   2020-11-10
+ * @version： V1.0
+ */
+public interface IFbsPersonnelService extends IService<FbsPersonnel> {
+
+}

src/main/java/org/jeecg/modules/fbsBasedate/service/impl/FbsPersonnelServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.fbsBasedate.service.impl;
+
+import org.jeecg.modules.fbsBasedate.entity.FbsPersonnel;
+import org.jeecg.modules.fbsBasedate.mapper.FbsPersonnelMapper;
+import org.jeecg.modules.fbsBasedate.service.IFbsPersonnelService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 人员档案
+ * @author： jeecg-boot
+ * @date：   2020-11-10
+ * @version： V1.0
+ */
+@Service
+public class FbsPersonnelServiceImpl extends ServiceImpl<FbsPersonnelMapper, FbsPersonnel> implements IFbsPersonnelService {
+
+}

src/main/java/org/jeecg/modules/fbsBasedate/vue/FbsPersonnelList.vue

@@ -0,0 +1,229 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="24">
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="人员编码">
+              <a-input placeholder="请输入人员编码" v-model="queryParam.personnelCode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="人员名称">
+              <a-input placeholder="请输入人员名称" v-model="queryParam.personnelName"></a-input>
+            </a-form-item>
+          </a-col>
+        <template v-if="toggleSearchStatus">
+        <a-col :md="6" :sm="8">
+            <a-form-item label="备注">
+              <a-input placeholder="请输入备注" v-model="queryParam.memo"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="删除标记0正常1删除">
+              <a-input placeholder="请输入删除标记0正常1删除" v-model="queryParam.delFlag"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="自定义字段1">
+              <a-input placeholder="请输入自定义字段1" v-model="queryParam.def1"></a-input>
+            </a-form-item>
+          </a-col>
+        </template>
+          <a-col :md="6" :sm="8" >
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <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" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <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"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <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-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <fbsPersonnel-modal ref="modalForm" @ok="modalFormOk"></fbsPersonnel-modal>
+  </a-card>
+</template>
+
+<script>
+  import FbsPersonnelModal from './modules/FbsPersonnelModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: "FbsPersonnelList",
+    mixins:[JeecgListMixin],
+    components: {
+      FbsPersonnelModal
+    },
+    data () {
+      return {
+        description: '人员档案管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+           },
+		   {
+            title: '人员编码',
+            align:"center",
+            dataIndex: 'personnelCode'
+           },
+		   {
+            title: '人员名称',
+            align:"center",
+            dataIndex: 'personnelName'
+           },
+		   {
+            title: '备注',
+            align:"center",
+            dataIndex: 'memo'
+           },
+		   {
+            title: '删除标记0正常1删除',
+            align:"center",
+            dataIndex: 'delFlag'
+           },
+		   {
+            title: '自定义字段1',
+            align:"center",
+            dataIndex: 'def1'
+           },
+		   {
+            title: '自定义字段2',
+            align:"center",
+            dataIndex: 'def2'
+           },
+		   {
+            title: '自定义字段3',
+            align:"center",
+            dataIndex: 'def3'
+           },
+		   {
+            title: '自定义字段4',
+            align:"center",
+            dataIndex: 'def4'
+           },
+		   {
+            title: '自定义字段5',
+            align:"center",
+            dataIndex: 'def5'
+           },
+		   {
+            title: '排序',
+            align:"center",
+            dataIndex: 'sort'
+           },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+		url: {
+          list: "/fbsBasedate/fbsPersonnel/list",
+          delete: "/fbsBasedate/fbsPersonnel/delete",
+          deleteBatch: "/fbsBasedate/fbsPersonnel/deleteBatch",
+          exportXlsUrl: "fbsBasedate/fbsPersonnel/exportXls",
+          importExcelUrl: "fbsBasedate/fbsPersonnel/importExcel",
+       },
+    }
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+    methods: {
+     
+    }
+  }
+</script>
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 3px
+  }
+  .ant-card-body .table-operator{
+    margin-bottom: 18px;
+  }
+  .ant-table-tbody .ant-table-row td{
+    padding-top:15px;
+    padding-bottom:15px;
+  }
+  .anty-row-operator button{margin: 0 5px}
+  .ant-btn-danger{background-color: #ffffff}
+
+  .ant-modal-cust-warp{height: 100%}
+  .ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto}
+  .ant-modal-cust-warp .ant-modal-content{height:90% !important;overflow-y: hidden}
+</style>

src/main/java/org/jeecg/modules/fbsBasedate/vue/modules/FbsPersonnelModal.vue

@@ -0,0 +1,179 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+      
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="人员编码">
+          <a-input placeholder="请输入人员编码" v-decorator="['personnelCode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="人员名称">
+          <a-input placeholder="请输入人员名称" v-decorator="['personnelName', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="备注">
+          <a-input placeholder="请输入备注" v-decorator="['memo', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="删除标记0正常1删除">
+          <a-input placeholder="请输入删除标记0正常1删除" v-decorator="['delFlag', validatorRules.delFlag ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="自定义字段1">
+          <a-input placeholder="请输入自定义字段1" v-decorator="['def1', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="自定义字段2">
+          <a-input placeholder="请输入自定义字段2" v-decorator="['def2', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="自定义字段3">
+          <a-input placeholder="请输入自定义字段3" v-decorator="['def3', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="自定义字段4">
+          <a-input placeholder="请输入自定义字段4" v-decorator="['def4', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="自定义字段5">
+          <a-input placeholder="请输入自定义字段5" v-decorator="['def5', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="排序">
+          <a-input-number v-decorator="[ 'sort', {}]" />
+        </a-form-item>
+		
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "FbsPersonnelModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        delFlag:{rules: [{ required: true, message: '请输入删除标记0正常1删除!' }]},
+        },
+        url: {
+          add: "/fbsBasedate/fbsPersonnel/add",
+          edit: "/fbsBasedate/fbsPersonnel/edit",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'personnelCode','personnelName','memo','delFlag','def1','def2','def3','def4','def5','sort'))
+		  //时间格式化
+        });
+
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+            
+            console.log(formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/main/java/org/jeecg/modules/fbsBasedate/vue/modules/FbsPersonnelModal__Style#Drawer.vue

@@ -0,0 +1,186 @@
+<template>
+  <a-drawer
+      :title="title"
+      :width="800"
+      placement="right"
+      :closable="false"
+      @close="close"
+      :visible="visible"
+  >
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+      
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="人员编码">
+          <a-input placeholder="请输入人员编码" v-decorator="['personnelCode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="人员名称">
+          <a-input placeholder="请输入人员名称" v-decorator="['personnelName', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="备注">
+          <a-input placeholder="请输入备注" v-decorator="['memo', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="删除标记0正常1删除">
+          <a-input placeholder="请输入删除标记0正常1删除" v-decorator="['delFlag', validatorRules.delFlag ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="自定义字段1">
+          <a-input placeholder="请输入自定义字段1" v-decorator="['def1', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="自定义字段2">
+          <a-input placeholder="请输入自定义字段2" v-decorator="['def2', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="自定义字段3">
+          <a-input placeholder="请输入自定义字段3" v-decorator="['def3', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="自定义字段4">
+          <a-input placeholder="请输入自定义字段4" v-decorator="['def4', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="自定义字段5">
+          <a-input placeholder="请输入自定义字段5" v-decorator="['def5', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="排序">
+          <a-input-number v-decorator="[ 'sort', {}]" />
+        </a-form-item>
+		
+      </a-form>
+    </a-spin>
+    <a-button type="primary" @click="handleOk">确定</a-button>
+    <a-button type="primary" @click="handleCancel">取消</a-button>
+  </a-drawer>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "FbsPersonnelModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        delFlag:{rules: [{ required: true, message: '请输入删除标记0正常1删除!' }]},
+        },
+        url: {
+          add: "/fbsBasedate/fbsPersonnel/add",
+          edit: "/fbsBasedate/fbsPersonnel/edit",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'personnelCode','personnelName','memo','delFlag','def1','def2','def3','def4','def5','sort'))
+		  //时间格式化
+        });
+
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+            
+            console.log(formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+
+
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+</style>

src/main/java/org/jeecg/modules/fbsMomOrder/mapper/xml/FbsMomOrderdetailMapper.xml

@@ -116,6 +116,7 @@
         LEFT JOIN mom_orderdetail mo ON mm.MoDId= mo.MoDId
         LEFT JOIN mom_order m ON mo.MoId= m.MoId
         LEFT JOIN Inventory i ON mo.InvCode= i.cInvCode
+        WHERE mo.RelsUser is NOT NULL
         GROUP BY
             mo.MoId,
             mo.InvCode,
@@ -166,7 +167,7 @@
         LEFT JOIN mom_orderdetail mo ON mm.MoDId= mo.MoDId
         LEFT JOIN mom_order m ON mo.MoId= m.MoId
         LEFT JOIN Inventory i ON mm.InvCode= i.cInvCode
-				where mm.Qty-mm.IssQty>0
+				where mm.Qty-mm.IssQty>0 and mo.RelsUser is NOT NULL
 				ORDER BY m.MoCode
     </select>
 

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/controller/FbsArrivalVouchsController.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.fbsQualityQualificationRate.service.IFbsQualityQualificationRateService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -50,7 +51,8 @@ public class FbsArrivalVouchsController {
 	private IFbsArrivalVouchsService fbsArrivalVouchsService;
 	@Resource
 	private FbsArrivalVouchsMapper fbsArrivalVouchsMapper;
-
+	@Resource
+	private IFbsQualityQualificationRateService iFbsQualityQualificationRateService;
 
 	 /**
 	  * 未来3天的到货计划(品质管理看板)
@@ -124,7 +126,27 @@ public class FbsArrivalVouchsController {
 		 return result;
 	}
 
+	/**
+	* @Author chenchuang
+	* @Description //TODO 品质看板：近六个月合格率 后台维护
+	* @Date 2020/11/10 11:21
+	* @Param []
+	* @return org.jeecg.common.api.vo.Result<java.util.List<java.util.Map<java.lang.String,java.lang.Object>>>
+	*/
+	 @RequestMapping(value = "/getLastSixMonthQualityTargetCompareWeb")
+	 public Result<List<Map<String,Object>>> getLastSixMonthQualityTargetCompareWeb(){
+		 Result<List<Map<String,Object>>> result=new Result<>();
+		 try {
+			 List<Map<String,Object>> map = iFbsQualityQualificationRateService.getLastSixMonthQualityTargetCompareWeb();
+			 result.setResult(map);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
 
+		 return result;
+	 }
 
 
 

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/entity/FbsArrivalVouchs.java

@@ -508,9 +508,6 @@ public class FbsArrivalVouchs implements Serializable {
 	@TableField(exist = false)
 	private Double arriveSum;//数量
 
-	//项目名称
-	@TableField(exist = false)
-	private String cdefine12;
 
 
 }

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/mapper/xml/FbsArrivalVouchsMapper.xml

@@ -20,7 +20,8 @@
             a.iQuantity arriveSum,
             d.cInvStd specs,
             b.cMemo memo,
-            b.cDefine12
+            b.cDefine12,
+            a.cItemName
         FROM
           PO_Podetails a
         LEFT JOIN PO_Pomain b ON a.POID = b.POID

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/service/IFbsArrivalVouchsService.java

@@ -16,6 +16,14 @@ public interface IFbsArrivalVouchsService extends IService<FbsArrivalVouchs> {
 
     public List<FbsArrivalVouchs> getWillArriveList();
 
+    /**
+    * @Author chenchuang
+    * @Description //TODO 品质看板：近六个月合格率U8
+    * @Date 2020/11/10 11:19
+    * @Param []
+    * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+    */
     public List<Map<String,Object>> getLastSixMonthQualityTargetCompare();
 
+
 }

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/service/impl/FbsArrivalVouchsServiceImpl.java

@@ -1,14 +1,19 @@
 package org.jeecg.modules.fbsPuArrivalvouch.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.modules.fbsPuArrivalvouch.entity.FbsArrivalVouchs;
 import org.jeecg.modules.fbsPuArrivalvouch.mapper.FbsArrivalVouchsMapper;
 import org.jeecg.modules.fbsPuArrivalvouch.service.IFbsArrivalVouchsService;
+import org.jeecg.modules.fbsQualityQualificationRate.entity.FbsQualityQualificationRate;
+import org.jeecg.modules.fbsQualityQualificationRate.mapper.FbsQualityQualificationRateMapper;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -24,6 +29,8 @@ public class FbsArrivalVouchsServiceImpl extends ServiceImpl<FbsArrivalVouchsMap
     @Resource
     private FbsArrivalVouchsMapper fbsArrivalVouchsMapper;
 
+    @Resource
+    private FbsQualityQualificationRateMapper fbsQualityQualificationRateMapper;
 
     @Override
     public List<FbsArrivalVouchs> getWillArriveList() {
@@ -38,4 +45,6 @@ public class FbsArrivalVouchsServiceImpl extends ServiceImpl<FbsArrivalVouchsMap
     public List<Map<String,Object>> getLastSixMonthQualityTargetCompare(){
         return fbsArrivalVouchsMapper.getLastSixMonthQualityTargetCompare();
     }
+
+
 }

src/main/java/org/jeecg/modules/fbsQualityQualificationRate/entity/FbsQualityQualificationRate.java

@@ -45,6 +45,24 @@ public class FbsQualityQualificationRate implements Serializable {
 	/**第六个月*/
 	@Excel(name = "第六个月", width = 15)
 	private Double sixMonth;
+	/**第一个月*/
+	@Excel(name = "月名称1", width = 15)
+	private String oneMonthName;
+	/**第二个月*/
+	@Excel(name = "月名称2", width = 15)
+	private String twoMonthName;
+	/**第三个月*/
+	@Excel(name = "月名称3", width = 15)
+	private String threeMonthName;
+	/**第四个月*/
+	@Excel(name = "月名称4", width = 15)
+	private String fourMonthName;
+	/**第五个月*/
+	@Excel(name = "月名称5", width = 15)
+	private String fiveMonthName;
+	/**第六个月*/
+	@Excel(name = "月名称6", width = 15)
+	private String sixMonthName;
 	/**备注*/
 	@Excel(name = "备注", width = 15)
 	private String memo;

src/main/java/org/jeecg/modules/fbsQualityQualificationRate/service/IFbsQualityQualificationRateService.java

@@ -3,6 +3,9 @@ package org.jeecg.modules.fbsQualityQualificationRate.service;
 import org.jeecg.modules.fbsQualityQualificationRate.entity.FbsQualityQualificationRate;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description: 品质看板合格率统计表格数据
  * @author： jeecg-boot
@@ -11,4 +14,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IFbsQualityQualificationRateService extends IService<FbsQualityQualificationRate> {
     int addData(FbsQualityQualificationRate fbsQualityQualificationRate);
+
+    /**
+     * @Author chenchuang
+     * @Description //TODO 品质看板：近六个月合格率 后台维护
+     * @Date 2020/11/10 11:19
+     * @Param []
+     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     */
+    public List<Map<String,Object>> getLastSixMonthQualityTargetCompareWeb();
 }

src/main/java/org/jeecg/modules/fbsQualityQualificationRate/service/impl/FbsQualityQualificationRateServiceImpl.java

@@ -9,6 +9,10 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 品质看板合格率统计表格数据
@@ -36,7 +40,52 @@ public class FbsQualityQualificationRateServiceImpl extends ServiceImpl<FbsQuali
         //修改
         iFbsQualityQualificationRateService.update(fbsQualityQualificationRateUpdate,lambdaQueryWrapper);
         //保存新记录
+        fbsQualityQualificationRate.setId(null);
         int result=fbsQualityQualificationRateMapper.insert(fbsQualityQualificationRate);
         return result;
     }
+
+    @Override
+    public List<Map<String, Object>> getLastSixMonthQualityTargetCompareWeb() {
+        List<Map<String,Object>> mapList=new ArrayList<>();
+
+        LambdaQueryWrapper<FbsQualityQualificationRate> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(FbsQualityQualificationRate::getDelFlag,'0');
+        List<FbsQualityQualificationRate> list=fbsQualityQualificationRateMapper.selectList(lambdaQueryWrapper);
+        if(list!=null&&list.size()>0){
+            FbsQualityQualificationRate fbsQualityQualificationRate=list.get(0);
+            Map<String,Object> map=new HashMap<>();
+            map.put("month",fbsQualityQualificationRate.getOneMonthName());
+            map.put("real",fbsQualityQualificationRate.getOneMonth());
+            map.put("target",fbsQualityQualificationRate.getScaleMark());
+            mapList.add(map);
+            Map<String,Object> map2=new HashMap<>();
+            map2.put("month",fbsQualityQualificationRate.getTwoMonthName());
+            map2.put("real",fbsQualityQualificationRate.getTwoMonth());
+            map2.put("target",fbsQualityQualificationRate.getScaleMark());
+            mapList.add(map2);
+            Map<String,Object> map3=new HashMap<>();
+            map3.put("month",fbsQualityQualificationRate.getThreeMonthName());
+            map3.put("real",fbsQualityQualificationRate.getThreeMonth());
+            map3.put("target",fbsQualityQualificationRate.getScaleMark());
+            mapList.add(map3);
+            Map<String,Object> map4=new HashMap<>();
+            map4.put("month",fbsQualityQualificationRate.getFourMonthName());
+            map4.put("real",fbsQualityQualificationRate.getFourMonth());
+            map4.put("target",fbsQualityQualificationRate.getScaleMark());
+            mapList.add(map4);
+            Map<String,Object> map5=new HashMap<>();
+            map5.put("month",fbsQualityQualificationRate.getFiveMonthName());
+            map5.put("real",fbsQualityQualificationRate.getFiveMonth());
+            map5.put("target",fbsQualityQualificationRate.getScaleMark());
+            mapList.add(map5);
+            Map<String,Object> map6=new HashMap<>();
+            map6.put("month",fbsQualityQualificationRate.getSixMonthName());
+            map6.put("real",fbsQualityQualificationRate.getSixMonth());
+            map6.put("target",fbsQualityQualificationRate.getScaleMark());
+            mapList.add(map6);
+
+        }
+        return mapList;
+    }
 }