仓库:备注+申请部门

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

@@ -25,6 +25,7 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreFormDTO extends BaseDTO implements Serializable {
 
+    private String applyDept;// 申请部门编码和用友oa保持一致
     private String applyUser;
     private String applyUserName;
     /**

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

@@ -23,6 +23,7 @@ import javax.persistence.Transient;
 @Table(name = "t_out_store_form")
 public class OutStoreForm implements Serializable{
 
+    private String applyDept;// 申请部门编码和用友oa保持一致
     private String applyUser;
     private String applyUserName;
     /**

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

@@ -25,6 +25,8 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreFormVO extends BaseVO implements Serializable {
+
+    private String applyDept;// 申请部门编码和用友oa保持一致
     private String applyUser;
     private String applyUserName;
     /**

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

@@ -7,7 +7,7 @@
                                      outstoreform.out_no,
                                      outstoreform.type,
                                      outstoreform.yy_id,
-outstoreform.apply_user,outstoreform.apply_user_name,
+outstoreform.apply_user,outstoreform.apply_user_name,outstoreform.apply_dept,
                                      outstoreform.yy_message,
                                      outstoreform.pick_id,
                                      outstoreform.pick_no,
@@ -29,7 +29,7 @@ outstoreform.process_instance_id,
         outstoreform.out_no,
                                       outstoreform.total_price,
                                        outstoreform.status,
-                                     outstoreform.yy_id,
+                                     outstoreform.yy_id,outstoreform.apply_dept,
 outstoreform.apply_user,outstoreform.apply_user_name,
                                      outstoreform.yy_message,
                                       outstoreform.type,
@@ -55,6 +55,9 @@ outstoreform.process_instance_id,
         <if test="storeId != null and storeId != ''">
             and outstoreform.store_id = #{storeId}
         </if>
+        <if test="applyDept != null and applyDept != ''">
+            and outstoreform.apply_dept = #{applyDept}
+        </if>
         <if test="applyUser != null and applyUser != ''">
             and outstoreform.apply_user = #{applyUser}
         </if>

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

@@ -277,11 +277,13 @@ public class YongyouServiceImpl implements YongyouService {
         otherOutMain.setDdate(DateUtils.dateToString(outStoreFormVO.getUserTime(), DateUtils.PATTERN_YMD) + " 00:00:00");
         otherOutMain.setVt_id("85");
         otherOutMain.setBisstqc(false);
-        otherOutMain.setCcode("0000000006");
+        // otherOutMain.setCcode("0000000006");
         otherOutMain.setCrdcode(outStoreFormVO.getType()+""); // 出库类型
         otherOutMain.setCsource("库存");
         otherOutMain.setCdefine14(outStoreFormVO.getId());// 保存设备系统的单据id
         otherOutMain.setCmaker(outStoreFormVO.getCreatedUserName());// 申请人名称
+        otherOutMain.setCdepcode(outStoreFormVO.getApplyDept());// 申请人部门
+        otherOutMain.setCmemo(outStoreFormVO.getRemark());// 申请备注
         List<OutStoreDetailVO> detailVOS = outStoreFormVO.getDetailList();
         for (OutStoreDetailVO vo : detailVOS) {
             OtherOutDetail detail = new OtherOutDetail();