优化

platform-common/src/main/java/com/platform/common/yongyou/request/AddSpareRequest.java

@@ -1,10 +1,13 @@
 package com.platform.common.yongyou.request;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 
 @Data
 public class AddSpareRequest extends BaseRequest{
+    @JSONField(name="Inventory")
     private Inventory Inventory;
+    @JSONField(name="TradeID")
     private String TradeID;
 
 }

platform-common/src/main/java/com/platform/common/yongyou/request/Inventory.java

@@ -2,16 +2,20 @@ package com.platform.common.yongyou.request;
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 
 @Data
-public class Inventory {
-    private String cInvCode;//存货编码
-    private String cInvAddCode;//存货代码
+public class Inventory implements Serializable {
+    private String cInvCCode;//存货分类编码
+    private String cComUnitCode;//主计量单位编码
     private String cInvName;//存货名称
     private String cInvStd;//规格型号
-    private String cInvCCode;//存货分类编码
+
+
+    private String cInvCode;//存货编码
+    private String cInvAddCode;//存货代码
     private String cGroupCode;//计量单位组编码
-    private String cComUnitCode;//主计量单位编码
     private String cShopUnit;//零售计量单位 ，如果没有辅计量单位，为空
     private String cInvDepCode;//生产部门
     private String cValueType;//计价方式

platform-common/src/main/java/com/platform/common/yongyou/request/PuAppVouch.java

@@ -12,6 +12,6 @@ import java.util.List;
 public class PuAppVouch{
     @JSONField(name="PuAppMain")
     private PuAppMain PuAppMain;
-    @JSONField(name="PuAppMain")
+    @JSONField(name="PuAppDetail")
     private List<PuAppDetail> PuAppDetail;
 }

platform-common/src/main/java/com/platform/common/yongyou/request/PushPurchaseOrderRequest.java

@@ -1,10 +1,13 @@
 package com.platform.common.yongyou.request;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 
 @Data
 public class PushPurchaseOrderRequest extends BaseRequest{
+    @JSONField(name = "PuAppVouch")
     private PuAppVouch PuAppVouch;
+    @JSONField(name = "TradeID")
     private String TradeID;
 
 }

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

@@ -13,7 +13,7 @@ import java.time.LocalDate;
 /**
  * @Description 图层目录表DTO
  * @Author lsq
- * @Date 2023-07-25 15:59:52
+ * @Date 2023-07-25 17:24:22
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 @Data
@@ -54,6 +54,46 @@ public class LongYanSpareAddDTO extends BaseDTO implements Serializable {
      * 
      */
           private Integer status;
+          /**
+     * 
+     */
+          private String createdUserId;
+          /**
+     * 
+     */
+          private String createdUserName;
+          /**
+     * 
+     */
+        private LocalDateTime createdTime;
+      /**
+       * 开始
+       */
+      private LocalDateTime createdTimeStart;
+      /**
+       * 结束
+       */
+      private LocalDateTime createdTimeEnd;
+          /**
+     * 
+     */
+          private String updateUserId;
+          /**
+     * 
+     */
+          private String updateUserName;
+          /**
+     * 
+     */
+        private LocalDateTime updateTime;
+      /**
+       * 开始
+       */
+      private LocalDateTime updateTimeStart;
+      /**
+       * 结束
+       */
+      private LocalDateTime updateTimeEnd;
         /**
      * 关键字
      */

platform-dao/src/main/java/com/platform/dao/entity/spareAdd/LongYanSpareAdd.java

@@ -14,7 +14,7 @@ import javax.persistence.Transient;
 /**
  * @Description 图层目录表实体类
  * @Author lsq
- * @Date 2023-07-25 15:59:52
+ * @Date 2023-07-25 17:24:22
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 @Data
@@ -55,6 +55,30 @@ public class LongYanSpareAdd implements Serializable{
      * 
      */
     private Integer status;
+    /**
+     * 
+     */
+    private String createdUserId;
+    /**
+     * 
+     */
+    private String createdUserName;
+    /**
+     * 
+     */
+    private LocalDateTime createdTime;
+    /**
+     * 
+     */
+    private String updateUserId;
+    /**
+     * 
+     */
+    private String updateUserName;
+    /**
+     * 
+     */
+    private LocalDateTime updateTime;
 
    /**
     * 数据权限

platform-dao/src/main/java/com/platform/dao/mapper/spareAdd/LongYanSpareAddMapper.java

@@ -11,7 +11,7 @@ import java.util.List;
 /**
  * @Description 图层目录表 mapper
  * @Author lsq
- * @Date 2023-07-25 15:59:52
+ * @Date 2023-07-25 17:24:22
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 @Component

platform-dao/src/main/java/com/platform/dao/vo/export/spareAdd/ExportLongYanSpareAddVO.java

@@ -10,7 +10,7 @@ import java.time.LocalDate;
 /**
  * @Description 图层目录表导出VO
  * @Author lsq
- * @Date 2023-07-25 15:59:52
+ * @Date 2023-07-25 17:24:22
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 @Data
@@ -65,5 +65,41 @@ public class ExportLongYanSpareAddVO implements Serializable {
           @Excel(name = "", orderNum = "8")
       private Integer status;
     
+    /**
+   * 
+   */
+          @Excel(name = "", orderNum = "9")
+      private String createdUserId;
+    
+    /**
+   * 
+   */
+          @Excel(name = "", orderNum = "10")
+      private String createdUserName;
+    
+    /**
+   * 
+   */
+          @Excel(name = "", orderNum = "11")
+      private LocalDateTime createdTime;
+    
+    /**
+   * 
+   */
+          @Excel(name = "", orderNum = "12")
+      private String updateUserId;
+    
+    /**
+   * 
+   */
+          @Excel(name = "", orderNum = "13")
+      private String updateUserName;
+    
+    /**
+   * 
+   */
+          @Excel(name = "", orderNum = "14")
+      private LocalDateTime updateTime;
+    
   
 }

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

@@ -14,7 +14,7 @@ import java.time.LocalDate;
 /**
  * @Description 图层目录表VO结果类
  * @Author lsq
- * @Date 2023-07-25 15:59:52
+ * @Date 2023-07-25 17:24:22
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 @Data
@@ -54,6 +54,30 @@ public class LongYanSpareAddVO extends BaseVO implements Serializable{
      * 
      */
         private Integer status;
+        /**
+     * 
+     */
+        private String createdUserId;
+        /**
+     * 
+     */
+        private String createdUserName;
+        /**
+     * 
+     */
+        private LocalDateTime createdTime;
+        /**
+     * 
+     */
+        private String updateUserId;
+        /**
+     * 
+     */
+        private String updateUserName;
+        /**
+     * 
+     */
+        private LocalDateTime updateTime;
     
 
 

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

@@ -2,57 +2,93 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.platform.dao.mapper.spareAdd.LongYanSpareAddMapper">
     <sql id="Base_Column_List">
-                             spareAdd.id,
-                                     spareAdd.category,
-                                     spareAdd.big_category,
-                                     spareAdd.name,
-                                     spareAdd.ggxh,
-                                     spareAdd.unit,
-                                     spareAdd.remark,
-                                     spareAdd.status
+                             menu.id,
+                                     menu.category,
+                                     menu.big_category,
+                                     menu.name,
+                                     menu.ggxh,
+                                     menu.unit,
+                                     menu.remark,
+                                     menu.status,
+                                     menu.created_user_id,
+                                     menu.created_user_name,
+                                     menu.created_time,
+                                     menu.update_user_id,
+                                     menu.update_user_name,
+                                     menu.update_time
                         </sql>
     <sql id="Ref_Column_List">
-                                                                         spareAdd.category,
-                                     spareAdd.big_category,
-                                     spareAdd.name,
-                                     spareAdd.ggxh,
-                                     spareAdd.unit,
-                                     spareAdd.remark,
-                                     spareAdd.status
-                                </sql>
+                                                                         menu.category,
+                                     menu.big_category,
+                                     menu.name,
+                                     menu.ggxh,
+                                     menu.unit,
+                                     menu.remark,
+                                     menu.status,
+                                                                                                                                                                                                                                                                                                </sql>
     <sql id="List_Condition">
                                     <if test="id != null and id != ''">
-                    and spareAdd.id = #{id}
+                    and menu.id = #{id}
                 </if>
                                                 <if test="category != null and category != ''">
-                    and spareAdd.category = #{category}
+                    and menu.category = #{category}
                 </if>
                                                 <if test="bigCategory != null and bigCategory != ''">
-                    and spareAdd.big_category = #{bigCategory}
+                    and menu.big_category = #{bigCategory}
                 </if>
                                                 <if test="name != null and name != ''">
-                    and spareAdd.name = #{name}
+                    and menu.name = #{name}
                 </if>
                                                 <if test="ggxh != null and ggxh != ''">
-                    and spareAdd.ggxh = #{ggxh}
+                    and menu.ggxh = #{ggxh}
                 </if>
                                                 <if test="unit != null and unit != ''">
-                    and spareAdd.unit = #{unit}
+                    and menu.unit = #{unit}
                 </if>
                                                 <if test="remark != null and remark != ''">
-                    and spareAdd.remark = #{remark}
+                    and menu.remark = #{remark}
                 </if>
                                                 <if test="status != null">
-                    and spareAdd.status = #{status}
+                    and menu.status = #{status}
+                </if>
+                                                <if test="createdUserId != null and createdUserId != ''">
+                    and menu.created_user_id = #{createdUserId}
+                </if>
+                                                <if test="createdUserName != null and createdUserName != ''">
+                    and menu.created_user_name = #{createdUserName}
+                </if>
+                                                <if test="createdTimeStart != null">
+                    and menu.created_time <![CDATA[>=]]>; #{createdTimeStart}
+                </if>
+                <if test="createdTimeEnd != null">
+                    and menu.created_time <![CDATA[<=]]> #{createdTimeEnd}
+                </if>
+                <if test="createdTime != null">
+                    and menu.created_time = #{createdTime}
+                </if>
+                                                <if test="updateUserId != null and updateUserId != ''">
+                    and menu.update_user_id = #{updateUserId}
+                </if>
+                                                <if test="updateUserName != null and updateUserName != ''">
+                    and menu.update_user_name = #{updateUserName}
+                </if>
+                                                <if test="updateTimeStart != null">
+                    and menu.update_time <![CDATA[>=]]>; #{updateTimeStart}
+                </if>
+                <if test="updateTimeEnd != null">
+                    and menu.update_time <![CDATA[<=]]> #{updateTimeEnd}
+                </if>
+                <if test="updateTime != null">
+                    and menu.update_time = #{updateTime}
                 </if>
                             <if test="keyword != null and keyword != ''">
-            and spareAdd.id like concat(concat('%',#{keyword}),'%')
+            and menu.id like concat(concat('%',#{keyword}),'%')
         </if>
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.spareAdd.LongYanSpareAddDTO" resultType="com.platform.dao.vo.query.spareAdd.LongYanSpareAddVO">
-        select spareAdd.*
-                                                                                                                                                                                from t_long_yan_spare_add as spareAdd
-                                                                                                                                                                                <where>
+        select menu.*
+                                                                                                                                                                                                                                                                                                        from t_long_yan_spare_add as menu
+                                                                                                                                                                                                                                                                                                        <where>
             <include refid="List_Condition" />
         </where>
     </select>

platform-rest/src/main/java/com/platform/rest/controller/spareAdd/LongYanSpareAddController.java

@@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 /**
  * @Description 图层目录表 控制器
  * @Author lsq
- * @Date 2023-07-25 15:59:52
+ * @Date 2023-07-25 17:24:22
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 @RestController
@@ -71,7 +71,7 @@ public class LongYanSpareAddController {
   }
 
 
-                                                  
+                                                                                      
   /**
    * 通过id删除一条记录
    *

platform-service/src/main/java/com/platform/service/spareAdd/LongYanSpareAddService.java

@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * @Description 图层目录表 service
  * @Author lsq
- * @Date 2023-07-25 15:59:52
+ * @Date 2023-07-25 17:24:22
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface LongYanSpareAddService extends IBaseService<LongYanSpareAdd, LongYanSpareAddDTO> {
@@ -32,4 +32,4 @@ public interface LongYanSpareAddService extends IBaseService<LongYanSpareAdd, Lo
      */
     AbstractPageResultBean<LongYanSpareAddVO> selectPageList(LongYanSpareAddDTO record, int pageNum, int pageSize);
 
-                                                                                                    }
+                                                                                                                                                                            }

platform-service/src/main/java/com/platform/service/spareAdd/impl/LongYanSpareAddServiceImpl.java

@@ -19,7 +19,7 @@ import java.util.List;
 /**
  * @Description 图层目录表 service 实现类
  * @Author lsq
- * @Date 2023-07-25 15:59:52
+ * @Date 2023-07-25 17:24:22
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 @AllArgsConstructor
@@ -47,4 +47,4 @@ public class LongYanSpareAddServiceImpl extends BaseServiceImpl<LongYanSpareAddM
         return new MyPage(mapper.selectList(record));
     }
 
-                                                                                                    }
+                                                                                                                                                                            }

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -20,6 +20,7 @@ import com.platform.dao.entity.longyanpurchaseorder.LongYanPurchaseOrder;
 import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.entity.sb.SbModelSpareBom;
+import com.platform.dao.entity.spareAdd.LongYanSpareAdd;
 import com.platform.dao.entity.store.OutStoreDetail;
 import com.platform.dao.entity.store.OutStoreForm;
 import com.platform.dao.enums.OutStoreStatusEnum;
@@ -29,6 +30,7 @@ import com.platform.dao.mapper.longyanpurchaseorder.LongYanPurchaseOrderMapper;
 import com.platform.dao.mapper.repair.RepairApplicationFormMapper;
 import com.platform.dao.mapper.sb.SbInfoMapper;
 import com.platform.dao.mapper.sb.SbModelSpareBomMapper;
+import com.platform.dao.mapper.spareAdd.LongYanSpareAddMapper;
 import com.platform.dao.vo.query.longyanpurchaseorder.LongYanPurchaseDetailVO;
 import com.platform.dao.vo.query.longyanpurchaseorder.LongYanPurchaseOrderVO;
 import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
@@ -75,6 +77,8 @@ public class YongyouServiceImpl implements YongyouService {
     private LongYanPurchaseOrderMapper longYanPurchaseOrderMapper;
     @Resource
     private LongYanPurchaseDetailMapper longYanPurchaseDetailMapper;
+    @Resource
+    private LongYanSpareAddMapper longYanSpareAddMapper;
     private String token_key = "yongyou-token";
     private String Conn_key = "yongyou-Conn";
     private String cAcc_ID_key = "yongyou-cAcc_ID";
@@ -494,13 +498,13 @@ public class YongyouServiceImpl implements YongyouService {
     }
 
     @Override
-    public String addSpare(Inventory inventory,Integer tokenType) {
+    public String addSpare(Inventory Inventory,Integer tokenType) {
         AddSpareRequest request = new AddSpareRequest();
         UserInfo userInfo = SecurityUtils.getUserInfo();
-        inventory.setDInvCreateDatetime(DateUtils.dateToString(LocalDateTime.now()));
-        inventory.setCModifyPerson(userInfo.getUsername());
-        inventory.setDModifyDate(DateUtils.dateToString(LocalDateTime.now()));
-        request.setInventory(inventory);
+        Inventory.setDInvCreateDatetime(DateUtils.dateToString(LocalDateTime.now()));
+        Inventory.setCModifyPerson(userInfo.getRealName());
+        Inventory.setDModifyDate(DateUtils.dateToString(LocalDateTime.now()));
+        request.setInventory(Inventory);
         request.setTradeID("");
         request.setToken(geToken(tokenType));
         request.setConn(getConn2(tokenType));
@@ -514,6 +518,21 @@ public class YongyouServiceImpl implements YongyouService {
         handler.setRequest(request);
         String responseStr = handler.handler();
         AddSpareResponse response = JSONObject.parseObject(responseStr, AddSpareResponse.class);
+        LongYanSpareAdd longYanSpareAdd = new LongYanSpareAdd();
+        longYanSpareAdd.setId(IdGeneratorUtils.getObjectId());
+        longYanSpareAdd.setBigCategory(Inventory.getCInvCCode());
+        longYanSpareAdd.setCategory(Inventory.getCInvCCode());
+        longYanSpareAdd.setGgxh(Inventory.getCInvStd());
+        longYanSpareAdd.setName(Inventory.getCInvName());
+        longYanSpareAdd.setUnit(Inventory.getCComUnitCode());
+        longYanSpareAdd.setCreatedUserId(userInfo.getUserId());
+        longYanSpareAdd.setCreatedUserName(userInfo.getRealName());
+        longYanSpareAdd.setCreatedTime(LocalDateTime.now());
+        longYanSpareAdd.setUpdateUserId(userInfo.getUserId());
+        longYanSpareAdd.setUpdateUserName(userInfo.getRealName());
+        longYanSpareAdd.setUpdateTime(LocalDateTime.now());
+
+        longYanSpareAddMapper.insert(longYanSpareAdd);
         if (response.getErrcode()){
             return response.getErrmsg();
         }else {