生产退库修改

src/main/java/com/gaotao/modules/notify/controller/ProductionUnissueController.java

@@ -1,8 +1,11 @@
 package com.gaotao.modules.notify.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gaotao.common.utils.PageUtils;
 import com.gaotao.common.utils.R;
 import com.gaotao.modules.base.entity.SOScheduledRoutingData;
 import com.gaotao.modules.notify.entity.*;
+import com.gaotao.modules.notify.entity.dto.UnissueNotifyHeadDataDto;
 import com.gaotao.modules.notify.entity.vo.ShopOrderMaterialVo;
 import com.gaotao.modules.notify.entity.vo.ShopOrderVo;
 import com.gaotao.modules.notify.service.UnissueNotifyHeaderService;
@@ -143,4 +146,11 @@ public class ProductionUnissueController {
         unissueNotifyHeaderService.updateNotifyStatus(data);
         return R.ok();
     }
+
+    @PostMapping(value="/searchUnissueNotifyHeader")
+    @ResponseBody
+    public R searchUnissueNotifyHeader(@RequestBody UnissueNotifyHeadDataDto data) {
+        PageUtils page  = unissueNotifyHeaderService.searchUnissueNotifyHeader(data);
+        return R.ok().put("page", page);
+    }
 }

src/main/java/com/gaotao/modules/notify/entity/dto/UnissueNotifyHeadDataDto.java

@@ -0,0 +1,42 @@
+package com.gaotao.modules.notify.entity.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.gaotao.modules.notify.entity.InventoryCheckResult;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class UnissueNotifyHeadDataDto {
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startDate;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endDate;
+    private List<String> orderStatusList;
+    private String workShopId;
+    private String buDesc;
+    private String userDisplay;
+    private String sql;
+    private String workShopName;
+    private String closeRemark;
+    private String username;
+    private String status;
+
+    private int page;
+    private int limit;
+
+    private int pageNum;
+    private int pageSize;
+
+    private String notifyNo;
+
+    /**
+     * 库存预览数据列表（用于推送WCS）
+     */
+    private List<InventoryCheckResult> inventoryList;
+}

src/main/java/com/gaotao/modules/notify/mapper/UnissueNotifyHeaderMapper.java

@@ -1,8 +1,12 @@
 package com.gaotao.modules.notify.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gaotao.modules.notify.entity.*;
+import com.gaotao.modules.notify.entity.dto.UnissueNotifyHeadDataDto;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -25,4 +29,6 @@ public interface UnissueNotifyHeaderMapper extends BaseMapper<UnissueNotifyHeade
     int deleteUnissueNotifyHeader(UnissueNotifyHeader data);
 
     int updateNotifyStatus(UnissueNotifyHeader data);
+
+    IPage<UnissueNotifyHeader> searchNotifyHeader(Page<UnissueNotifyHeader> page, @Param("data") UnissueNotifyHeadDataDto data);
 }

src/main/java/com/gaotao/modules/notify/service/UnissueNotifyHeaderService.java

@@ -1,10 +1,13 @@
 package com.gaotao.modules.notify.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gaotao.common.utils.PageUtils;
 import com.gaotao.modules.base.entity.SOScheduledRoutingData;
 import com.gaotao.modules.notify.entity.SOIssueNotifyHeaderData;
 import com.gaotao.modules.notify.entity.UnissueNotifyHeader;
 import com.gaotao.modules.notify.entity.UnissueNotifyOrderList;
 import com.gaotao.modules.notify.entity.UnissueNotifyOrderMaterialList;
+import com.gaotao.modules.notify.entity.dto.UnissueNotifyHeadDataDto;
 import com.gaotao.modules.notify.entity.vo.ShopOrderMaterialVo;
 import com.gaotao.modules.notify.entity.vo.ShopOrderVo;
 
@@ -34,4 +37,6 @@ public interface UnissueNotifyHeaderService {
     List<UnissueNotifyOrderMaterialList> searchUnissueNotifyMaterialList(UnissueNotifyOrderList data);
 
     void updateNotifyStatus(UnissueNotifyHeader data);
+
+    PageUtils searchUnissueNotifyHeader(UnissueNotifyHeadDataDto data);
 }

src/main/java/com/gaotao/modules/notify/service/impl/UnissueNotifyHeaderServiceImpl.java

@@ -2,10 +2,14 @@ package com.gaotao.modules.notify.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gaotao.common.utils.PageUtils;
 import com.gaotao.common.utils.R;
 import com.gaotao.modules.api.service.IfsApiIssueAndReturnService;
 import com.gaotao.modules.base.entity.SOScheduledRoutingData;
 import com.gaotao.modules.notify.entity.*;
+import com.gaotao.modules.notify.entity.dto.UnissueNotifyHeadDataDto;
 import com.gaotao.modules.notify.entity.vo.ShopOrderMaterialVo;
 import com.gaotao.modules.notify.entity.vo.ShopOrderVo;
 import com.gaotao.modules.notify.mapper.UnissueNotifyHeaderMapper;
@@ -194,5 +198,24 @@ public class UnissueNotifyHeaderServiceImpl implements UnissueNotifyHeaderServic
         unissueNotifyHeaderMapper.updateNotifyStatus(data);
     }
 
+    @Override
+    public PageUtils searchUnissueNotifyHeader(UnissueNotifyHeadDataDto data) {
+        if(data.getOrderStatusList() !=null && data.getOrderStatusList().size()>0){
+            String str="(";
+            for (int i = 0; i <data.getOrderStatusList().size() ; i++) {
+                if(i!=data.getOrderStatusList().size()-1){
+                    str=str+"'"+data.getOrderStatusList().get(i)+"',";
+                }else {
+                    str=str+"'"+data.getOrderStatusList().get(i)+"'";
+                }
+            }
+            str=str+")";
+            data.setSql(str);
+        }
+        Page<UnissueNotifyHeader> page = new Page<>(data.getPage(), data.getLimit());
+        IPage<UnissueNotifyHeader> resultList = unissueNotifyHeaderMapper.searchNotifyHeader(page, data);
+        return new PageUtils(resultList);
+    }
+
 }
 

src/main/resources/mapper/notify/UnissueNotifyHeaderMapper.xml

@@ -38,4 +38,37 @@
     <update id="updateNotifyStatus" >
         update unissue_notify_header set status=#{status} where site=#{site} and notify_no=#{notifyNo}
     </update>
+    <select id="searchNotifyHeader"  resultType="UnissueNotifyHeader">
+        select <include refid="baseColumn" />
+        from unissue_notify_header a
+        left join sys_user b on a.username=b.username
+
+        <where>
+
+            <if test="data.notifyNo != null and data.notifyNo != ''">
+                AND a.notify_no = #{data.notifyNo}
+            </if>
+            <if test="data.status != null and data.status != ''">
+                AND a.status = #{data.status}
+            </if>
+            <if test = "data.username != null and data.username != ''">
+                AND a.username LIKE  #{data.username}
+            </if>
+
+            <if test = "data.startDate != null ">
+                AND a.notify_date >=  #{data.startDate}
+            </if>
+            <if test = "data.endDate != null">
+                AND #{data.endDate} >=a.notify_date
+            </if>
+            <if test = "data.orderStatusList != null">
+                AND a.status in
+                <foreach collection="data.orderStatusList" item="status" open="(" close=")" separator=",">
+                    #{status}
+                </foreach>
+            </if>
+
+        </where>
+        order by a.notify_no desc
+    </select>
 </mapper>