优化出库和退库

platform-dao/src/main/java/com/platform/dao/dto/store/OutStoreDetailDTO.java

@@ -148,7 +148,7 @@ public class OutStoreDetailDTO extends BaseDTO implements Serializable {
     /**
      * 是否出库：0退库，1出库
      */
-    private Boolean isOut;
+    private Integer isOut;
     /**
      * 打印新增字段
      */

platform-dao/src/main/java/com/platform/dao/dto/store/OutStoreFormDTO.java

@@ -25,6 +25,8 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreFormDTO extends BaseDTO implements Serializable {
 
+    private String applyUser;
+    private String applyUserName;
     /**
      * 用友返回信息
      */
@@ -155,5 +157,5 @@ public class OutStoreFormDTO extends BaseDTO implements Serializable {
     /**
      * 是否出库：0退库，1出库
      */
-    private Boolean isOut;
+    private Integer isOut;
 }

platform-dao/src/main/java/com/platform/dao/entity/store/OutStoreForm.java

@@ -23,6 +23,8 @@ import javax.persistence.Transient;
 @Table(name = "t_out_store_form")
 public class OutStoreForm implements Serializable{
 
+    private String applyUser;
+    private String applyUserName;
     /**
      * 用友返回信息
      */
@@ -108,5 +110,5 @@ public class OutStoreForm implements Serializable{
     /**
      * 是否出库：0退库，1出库
      */
-    private Boolean isOut;
+    private Integer isOut;
 }

platform-dao/src/main/java/com/platform/dao/vo/query/store/OutStoreFormVO.java

@@ -25,7 +25,8 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreFormVO extends BaseVO implements Serializable {
-
+    private String applyUser;
+    private String applyUserName;
     /**
      * 用友返回信息
      */
@@ -118,5 +119,5 @@ public class OutStoreFormVO extends BaseVO implements Serializable {
     /**
      * 是否出库：0退库，1出库
      */
-    private Boolean isOut;
+    private Integer isOut;
 }

platform-dao/src/main/resources/mapper/store/OutStoreFormMapper.xml

@@ -2,14 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.platform.dao.mapper.store.OutStoreFormMapper">
     <sql id="Base_Column_List">
-        outstoreform
-        .
-        id
-        ,
+        outstoreform.id,
                              outstoreform.total_price,
                                      outstoreform.out_no,
                                      outstoreform.type,
                                      outstoreform.yy_id,
+outstoreform.apply_user,outstoreform.apply_user_name,
                                      outstoreform.yy_message,
                                      outstoreform.pick_id,
                                      outstoreform.pick_no,
@@ -28,13 +26,11 @@ outstoreform.process_instance_id,
                                      outstoreform.update_time
     </sql>
     <sql id="Ref_Column_List">
-        outstoreform
-        .
-        out_no
-        ,
+        outstoreform.out_no,
                                       outstoreform.total_price,
                                        outstoreform.status,
                                      outstoreform.yy_id,
+outstoreform.apply_user,outstoreform.apply_user_name,
                                      outstoreform.yy_message,
                                       outstoreform.type,
                                       outstoreform.store_id,
@@ -59,6 +55,12 @@ outstoreform.process_instance_id,
         <if test="storeId != null and storeId != ''">
             and outstoreform.store_id = #{storeId}
         </if>
+        <if test="applyUser != null and applyUser != ''">
+            and outstoreform.apply_user = #{applyUser}
+        </if>
+        <if test="applyUserName != null and applyUserName != ''">
+            and outstoreform.apply_user_name = #{applyUserName}
+        </if>
         <if test="pickId != null and pickId != ''">
             and outstoreform.pick_id = #{pickId}
         </if>

platform-rest/src/main/resources/application-dev.yml

@@ -76,8 +76,6 @@ ignore:
     - /ignores/**
     - /wechat/**
     - /yongyou/**
-    - /sb/measure-logs/generate/init
-
 
 platform:
   slf4j:

platform-service/src/main/java/com/platform/service/business/impl/OutStoreFormActivitiServiceImpl.java

@@ -130,6 +130,8 @@ public class OutStoreFormActivitiServiceImpl extends BaseFormCheckServiceAbstrac
                 outStoreForm.setYyId(response.getData());
             }
         }
+        outStoreForm.setApplyUser(SecurityUtils.getUserInfo().getUserId());
+        outStoreForm.setApplyUserName(SecurityUtils.getUserInfo().getRealName());
         outStoreForm.setUpdateTime(LocalDateTime.now());
         outStoreForm.setUpdateUserId(SecurityUtils.getUserInfo().getUserId());
         outStoreForm.setUpdateUserName(SecurityUtils.getUserInfo().getRealName());

platform-service/src/main/java/com/platform/service/store/impl/OutStoreFormServiceImpl.java

@@ -234,7 +234,7 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
         model.setDelFlag(false);
         model.setUserInfo(userInfo);
         model.setStatus(OutStoreStatusEnum.CREATED.getValue());
-        model.setType(OutStoreTypeEnum.CHUKU_LINGYONG.getValue());
+        // model.setType(OutStoreTypeEnum.CHUKU_LINGYONG.getValue());
         model.setUserInfo(userInfo);
         // 出库单详情
         List<OutStoreDetailDTO> detailList = model.getDetailList();
@@ -807,6 +807,7 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
         outStoreForm.setId(id);
         outStoreForm.setYyId(yyId);
         outStoreForm.setStatus(OutStoreStatusEnum.PUSH_OK.getValue());
+        outStoreForm.setYyMessage("");
         outStoreForm.setUpdateTime(LocalDateTime.now());
         // outStoreForm.setUpdateUserId(SecurityUtils.getUserInfo().getUserId());
         // outStoreForm.setUpdateUserName(SecurityUtils.getUserInfo().getRealName());