hfxc226 2 жил өмнө
parent
commit
77cb5379fa

+ 9 - 0
platform-dao/src/main/resources/mapper/sb/SbInfoMapper.xml

@@ -263,6 +263,9 @@ user.real_name as saveUserName,sb.repair_dept_id
         <if test="useProject != null">
             and sb.use_project = #{useProject}
         </if>
+        <if test="baoyangTimes != null">
+            and sb.baoyang_times = #{baoyangTimes}
+        </if>
         <if test="typeId != null and typeId != ''">
             and sb.type_id = #{typeId}
         </if>
@@ -366,6 +369,9 @@ user.real_name as saveUserName,sb.repair_dept_id
         <if test="useType != null">
             and sb.use_type = #{useType}
         </if>
+        <if test="baoyangTimes != null">
+            and sb.baoyang_times = #{baoyangTimes}
+        </if>
         <if test="id != null">
             and sb.id = #{id}
         </if>
@@ -509,6 +515,9 @@ user.real_name as saveUserName,sb.repair_dept_id
         <if test="useGroup != null">
             and sb.use_group = #{useGroup}
         </if>
+        <if test="baoyangTimes != null">
+            and sb.baoyang_times = #{baoyangTimes}
+        </if>
         <if test="nextCheckDateStart != null">
             and sb.next_check_date <![CDATA[ >= ]]> #{nextCheckDateStart}
         </if>

+ 2 - 1
platform-rest/src/main/java/com/platform/rest/controller/yongyou/YongyouController.java

@@ -93,7 +93,7 @@ public class YongyouController {
     @SysLog("用友回调领用出库单")
     @PostMapping("/outstore")
     public R BackSparePickForm(String jsonStr) {
-        log.info("用友回调领用出库单:,返回数据:" + jsonStr);
+        log.info("用友回调出库单:,返回数据:" + jsonStr);
         yongyouService.backOutForm(jsonStr);
         return new R<>();
     }
@@ -122,6 +122,7 @@ public class YongyouController {
     @SysLog("用友回调退库单")
     @PostMapping("/restore")
     public R updateSpareRestoreForm(String jsonStr) {
+        log.info("用友回调退库单:,返回数据:" + jsonStr);
         yongyouService.backOutForm(jsonStr);
         return new R<>();
     }