2023-12-12 赫艾出库核验

src/main/java/com/heai/modules/pad/controller/PadController.java

@@ -153,9 +153,9 @@ public class PadController {
      * @throw
      */
     @GetMapping("/searchDelHeaderList")
-    public R searchDelHeaderList(String site,String startDate,String endDate,String customerId,String delNotifyNo,
+    public R searchDelHeaderList(String site,String startDate,String endDate,String customerId,String delNotifyNo,String shipFlag,
                                        @RequestParam(value = "no",defaultValue = "1")Integer no,@RequestParam(value = "size",defaultValue = "50")Integer size){
-        IPage<DelNotifyHeaderVo> iPage = delNotifyHeaderService.searchDelHeaderByPage(site, startDate, endDate, customerId, delNotifyNo, no, size);
+        IPage<DelNotifyHeaderVo> iPage = delNotifyHeaderService.searchDelHeaderByPage(site, startDate, endDate, customerId, delNotifyNo, no, size,shipFlag);
         return R.ok().put("data",iPage);
     }
     /**

src/main/java/com/heai/modules/pad/dao/DelNotifyHeaderMapper.java

@@ -16,5 +16,6 @@ public interface DelNotifyHeaderMapper extends BaseMapper<DelNotifyHeader> {
                                                    @Param("customerId")String customerId,
                                                    @Param("delNotifyNo")String delNotifyNo,
                                                    @Param("startDate")String startDate,
-                                                   @Param("endDate")String endDate);
+                                                   @Param("endDate")String endDate,
+                                                   @Param("shipFlag")String shipFlag);
 }

src/main/java/com/heai/modules/pad/service/DelNotifyHeaderService.java

@@ -9,5 +9,5 @@ public interface DelNotifyHeaderService extends IService<DelNotifyHeader> {
 
     IPage<DelNotifyHeaderVo> searchDelHeaderByPage(String site, String startDate, String endDate,
                                                    String customerId, String delNotifyNo,
-                                                   Integer no, Integer size);
+                                                   Integer no, Integer size,String shipFlag);
 }

src/main/java/com/heai/modules/pad/service/impl/DelNotifyHeaderServiceImpl.java

@@ -17,11 +17,11 @@ import org.springframework.util.StringUtils;
 public class DelNotifyHeaderServiceImpl extends ServiceImpl<DelNotifyHeaderMapper, DelNotifyHeader> implements DelNotifyHeaderService {
 
     @Override
-    public IPage<DelNotifyHeaderVo> searchDelHeaderByPage(String site, String startDate, String endDate, String customerId, String delNotifyNo, Integer no, Integer size) {
+    public IPage<DelNotifyHeaderVo> searchDelHeaderByPage(String site, String startDate, String endDate, String customerId, String delNotifyNo, Integer no, Integer size,String shipFlag) {
         if (StringUtils.hasText(startDate) && StringUtils.hasText(endDate)){
             startDate = startDate + " 00:00:00";
             endDate = endDate + " 23:59:59";
         }
-        return baseMapper.searchDelHeaderByPage(new Page<>(no,size),site,customerId,delNotifyNo,startDate,endDate);
+        return baseMapper.searchDelHeaderByPage(new Page<>(no,size),site,customerId,delNotifyNo,startDate,endDate,shipFlag);
     }
 }

src/main/resources/mapper/pad/DelNotifyHeaderMapper.xml

@@ -75,6 +75,9 @@
         <if test="endDate != null and endDate != ''">
             and T.NotifyDate &lt;= #{endDate}
         </if>
+        <if test="shipFlag != null and shipFlag != ''">
+            and T.ShipFlag = #{shipFlag}
+        </if>
         order by T.DelNotifyNo desc
     </select>
 </mapper>