采购优化

platform-dao/src/main/java/com/platform/dao/dto/spareAdd/Inventory.java

@@ -1,6 +1,5 @@
 package com.platform.dao.dto.spareAdd;
 
-import com.platform.common.util.IdGeneratorUtils;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -18,12 +17,7 @@ public class Inventory implements Serializable {
     private String cSRPolicy;//供需政策
     private Integer fConvertRate;
     private Integer iRequireTrackStyle;//需求跟踪方式
-
-
-
-//    private String cInvCode= IdGeneratorUtils.getObjectId();//存货编码
     private String cInvCode;//存货编码
-
     private String cInvAddCode;//存货代码
     private String cShopUnit;//零售计量单位 ，如果没有辅计量单位，为空
     private String cInvDepCode;//生产部门
@@ -54,6 +48,4 @@ public class Inventory implements Serializable {
     private boolean bFree3;//存货是否有自由项3 ， 材质硬度
     private Integer tokenType;
 
-
-
 }

platform-dao/src/main/java/com/platform/dao/dto/spareAdd/LongYanSpareAddDTO.java

@@ -5,10 +5,10 @@ import com.platform.common.validation.group.UpdateGroup;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import javax.validation.constraints.*;
+
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import java.time.LocalDate;
 
 /**
  * @Description 图层目录表DTO
@@ -31,79 +31,78 @@ public class LongYanSpareAddDTO extends BaseDTO implements Serializable {
     /**
      *
      */
-        @NotNull(groups = {UpdateGroup.class}, message = "ID不能为空")
     private String id;
-          /**
+    /**
      * 存货分类
      */
-          private String category;
-          /**
+    private String category;
+    /**
      * 存货大类
      */
-          private String bigCategory;
-          /**
+    private String bigCategory;
+    /**
      * 物料名称
      */
-          private String name;
-          /**
+    private String name;
+    /**
      * 规格型号
      */
-          private String ggxh;
-          /**
+    private String ggxh;
+    /**
      * 计量单位
      */
-          private String unit;
-          /**
+    private String unit;
+    /**
      * 备注
      */
-          private String remark;
-          /**
+    private String remark;
+    /**
      *
      */
-          private Integer status;
-          /**
+    private Integer status;
+    /**
      *
      */
-          private String createdUserId;
-          /**
+    private String createdUserId;
+    /**
      *
      */
-          private String createdUserName;
-          /**
+    private String createdUserName;
+    /**
      *
      */
-        private LocalDateTime createdTime;
-      /**
-       * 开始
-       */
-      private LocalDateTime createdTimeStart;
-      /**
-       * 结束
-       */
-      private LocalDateTime createdTimeEnd;
-          /**
+    private LocalDateTime createdTime;
+    /**
+     * 开始
+     */
+    private LocalDateTime createdTimeStart;
+    /**
+     * 结束
+     */
+    private LocalDateTime createdTimeEnd;
+    /**
      *
      */
-          private String updateUserId;
-          /**
+    private String updateUserId;
+    /**
      *
      */
-          private String updateUserName;
-          /**
+    private String updateUserName;
+    /**
      *
      */
-        private LocalDateTime updateTime;
-      /**
-       * 开始
-       */
-      private LocalDateTime updateTimeStart;
-      /**
-       * 结束
-       */
-      private LocalDateTime updateTimeEnd;
-        /**
+    private LocalDateTime updateTime;
+    /**
+     * 开始
+     */
+    private LocalDateTime updateTimeStart;
+    /**
+     * 结束
+     */
+    private LocalDateTime updateTimeEnd;
+    /**
      * 关键字
      */
-  private String keyword;
+    private String keyword;
 
 }

platform-dao/src/main/java/com/platform/dao/vo/query/spareAdd/LongYanSpareAddVO.java

@@ -6,6 +6,7 @@ import com.platform.common.bean.BaseDTO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import javax.validation.constraints.*;
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -20,7 +21,7 @@ import java.time.LocalDate;
 @Data
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
-public class LongYanSpareAddVO extends BaseVO implements Serializable{
+public class LongYanSpareAddVO extends BaseVO implements Serializable {
     private String caComUnitCode;//成本默认计量单位编码
 
     private String planMethod;//计划方法
@@ -32,60 +33,61 @@ public class LongYanSpareAddVO extends BaseVO implements Serializable{
     /**
      *
      */
-        private String id;
-        /**
+    private String id;
+    /**
      * 存货分类
      */
-        private String category;
-        /**
+    private String category;
+    /**
      * 存货大类
      */
-        private String bigCategory;
-        /**
+    private String bigCategory;
+    /**
      * 物料名称
      */
-        private String name;
-        /**
+    private String name;
+    /**
      * 规格型号
      */
-        private String ggxh;
-        /**
+    private String ggxh;
+    /**
      * 计量单位
      */
-        private String unit;
-        /**
+    private String unit;
+    /**
      * 备注
      */
-        private String remark;
-        /**
+    private String remark;
+    /**
      *
      */
-        private Integer status;
-        /**
+    private Integer status;
+    /**
      *
      */
-        private String createdUserId;
-        /**
+    private String createdUserId;
+    /**
      *
      */
-        private String createdUserName;
-        /**
+    private String createdUserName;
+    /**
      *
      */
-        private LocalDateTime createdTime;
-        /**
+    private LocalDateTime createdTime;
+    /**
      *
      */
-        private String updateUserId;
-        /**
+    private String updateUserId;
+    /**
      *
      */
-        private String updateUserName;
-        /**
+    private String updateUserName;
+    /**
      *
      */
-        private LocalDateTime updateTime;
+    private LocalDateTime updateTime;
 
+    private String codeName;
 
 
 }

platform-dao/src/main/resources/mapper/spareAdd/LongYanSpareAddMapper.xml

@@ -87,8 +87,8 @@
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.spareAdd.LongYanSpareAddDTO"
             resultType="com.platform.dao.vo.query.spareAdd.LongYanSpareAddVO">
-        select menu.*
-        from t_long_yan_spare_add as menu
+        select menu.*,code.name as codeName
+        from t_long_yan_spare_add as menu join t_long_yan_inventory_code code on menu.category = code.code
         <where>
             <include refid="List_Condition"/>
         </where>