1.优化

maintain-business/src/main/java/com/maintain/business/domain/bo/ErpExamineProjectBo.java

@@ -31,7 +31,7 @@ public class ErpExamineProjectBo extends BaseEntity {
     /**
      * 检验类型ID
      */
-    @NotNull(message = "检验类型ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "检验类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long typeId;
 
     /**

maintain-business/src/main/java/com/maintain/business/domain/bo/ErpMaterialPutawayInfoBo.java

@@ -37,6 +37,16 @@ public class ErpMaterialPutawayInfoBo extends BaseEntity {
      */
     private String putawayCode;
 
+    /**
+     * 订单单号
+     */
+    private String orderNumber;
+
+    /**
+     * 到货单号
+     */
+    private String arrivalNumber;
+
     /**
      * 物资分类ID
      */

maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaintainCauseImportVo.java

@@ -2,6 +2,7 @@ package com.maintain.business.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.maintain.common.annotation.ExcelDictFormat;
 import com.maintain.common.convert.ExcelDictConvert;
 import lombok.Data;
@@ -37,6 +38,14 @@ public class ErpMaintainCauseImportVo implements Serializable {
     @ExcelProperty(value = "维修原因编号")
     private String maintainCauseCode;
 
+    /**
+     * 类型（1修理 2维护 3修理与维护）
+     */
+    @ExcelProperty(value = "类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "baoxiudanleixing")
+    @ColumnWidth(12)
+    private String type;
+
     /**
      * 是否删除（0否 1是 默认0）
      */

maintain-business/src/main/java/com/maintain/business/domain/vo/ErpMaterialVo.java

@@ -103,7 +103,6 @@ public class ErpMaterialVo implements Serializable {
     /**
      * 仓库名称
      */
-    @ExcelProperty(value = "仓库名称")
     private String warehouseName;
 
     /**
@@ -158,7 +157,6 @@ public class ErpMaterialVo implements Serializable {
     /**
      * 库存数量
      */
-    @ExcelProperty(value = "库存数量")
     private BigDecimal inventory;
 
     /**
@@ -171,6 +169,8 @@ public class ErpMaterialVo implements Serializable {
     /**
      * 是否通用（0否 1是 默认1）
      */
+    @ExcelProperty(value = "是否通用", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_is_enable")
     private String isUniversal;
 
     /**

maintain-business/src/main/java/com/maintain/business/listener/ErpUserImportListener.java

@@ -90,7 +90,9 @@ public class ErpUserImportListener extends AnalysisEventListener<ErpUserVo> impl
                 }
                 /* 班组不存在新增班组 */
                 LambdaQueryWrapper<ErpGroup> groupLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                groupLambdaQueryWrapper.eq(ErpGroup::getName, erpUser.getSiteGroupName());
+                groupLambdaQueryWrapper
+                    .eq(ErpGroup::getName, erpUser.getSiteGroupName())
+                    .eq(ErpGroup::getDeptName, erpUser.getDeptName());
                 ErpGroup erpGroup = groupMapper.selectOne(groupLambdaQueryWrapper);
                 if (erpGroup == null) {
                     ErpGroup group = new ErpGroup();
@@ -102,16 +104,16 @@ public class ErpUserImportListener extends AnalysisEventListener<ErpUserVo> impl
                     groupMapper.insert(group);
                 }else {
                     erpUser.setSiteGroupId(erpGroup.getId());
-                    erpUser.setDeptName(erpGroup.getName());
+                    erpUser.setSiteGroupName(erpGroup.getName());
                 }
                 /* 岗位不存在新增岗位 */
                 LambdaQueryWrapper<ErpPost> postLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                postLambdaQueryWrapper.eq(ErpPost::getName, erpUser.getPostName());
+                postLambdaQueryWrapper.eq(ErpPost::getName, erpUser.getPostName()).eq(ErpPost::getType, type);
                 ErpPost erpPost = postMapper.selectOne(postLambdaQueryWrapper);
                 if (erpPost == null) {
                     ErpPost post = new ErpPost();
                     post.setName(erpUser.getPostName());
-                    post.setType(1);
+                    post.setType(type);
                     postMapper.insert(post);
                 }else {
                     erpUser.setPostId(erpPost.getId());

maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPutawayInfoServiceImpl.java

@@ -79,6 +79,8 @@ public class ErpMaterialPutawayInfoServiceImpl implements IErpMaterialPutawayInf
     private QueryWrapper<ErpMaterialPutawayInfo> buildCustomQueryWrapper(ErpMaterialPutawayInfoBo bo) {
         QueryWrapper<ErpMaterialPutawayInfo> query = Wrappers.query();
         query.like(null != bo.getPutawayCode(),"emp.putaway_code", bo.getPutawayCode())
+                .like(null != bo.getOrderNumber(),"emp.order_number", bo.getOrderNumber())
+                .like(null != bo.getArrivalNumber(),"emp.arrival_number", bo.getArrivalNumber())
                 .like(null != bo.getVendorName(),"empi.vendor_name", bo.getVendorName())
                     .eq(null != bo.getMaterialId(),"empi.material_id", bo.getMaterialId())
                     .like(null != bo.getMaterialCode(),"empi.material_code", bo.getMaterialCode())

maintain-ui/src/views/business/maintainCause/index.vue

@@ -210,7 +210,7 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "business/maintainCause/importData"
+        url: process.env.VUE_APP_BASE_API + "/business/maintainCause/importData"
       },
       // 查询参数
       queryParams: {

maintain-ui/src/views/business/materialPickingInfo/index.vue

@@ -312,6 +312,7 @@ import {
 import { getRepairForm } from '@/api/business/repairForm'
 import { listMaterial } from '@/api/business/material'
 import {listMaterialVendorAll} from "@/api/business/materialVendor";
+import {formatDate} from "@/utils";
 
 export default {
   name: "MaterialPickingInfo",
@@ -548,6 +549,7 @@ export default {
         repairerGroupName : this.repairerGroupName,
         isDelivery : this.isDelivery,
         flag : this.flag,
+        outTime : formatDate(new Date().getTime()),
       }});
     },
     // 详情按钮

maintain-ui/src/views/business/materialPutaway/index.vue

@@ -767,6 +767,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      console.log('this.queryParams', this.queryParams);
       this.download('business/materialPutawayInfo/export', {
         ...this.queryParams
       }, `入库单明细_${new Date().getTime()}.xlsx`)

maintain-ui/src/views/business/projectType/index.vue

@@ -167,6 +167,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
+          this.form.type = this.type;
           if (this.form.typeId != null) {
             updateProjectType(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");