feat 变更采购单查询

pom.xml

@@ -43,6 +43,13 @@
 			<version>2.3.1</version> <!-- 根据实际版本调整 -->
 		</dependency>
 
+		<!-- 分页 -->
+		<dependency>
+			<groupId>com.github.pagehelper</groupId>
+			<artifactId>pagehelper-spring-boot-starter</artifactId>
+			<version>1.4.7</version>
+		</dependency>
+
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>easyexcel</artifactId>

zi-wms-boot/src/main/resources/application.yml

@@ -118,4 +118,8 @@ com:
             - GetAreaList
             - UserLogin
             - UserLogout
-        
+# application.yml
+pagehelper:
+  helperDialect: oracle
+  reasonable: true
+  supportMethodsArguments: true

zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java

@@ -3,6 +3,7 @@ package com.cim.idm.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.cim.idm.model.DeliveryDto;
+import com.cim.idm.model.PageDto;
 import com.cim.idm.service.IDeliveryService;
 import com.cim.idm.utils.AjaxResult;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -29,4 +30,12 @@ public class DeliveryController {
 		DeliveryDto dto = JSON.toJavaObject(in, DeliveryDto.class);
 		return AjaxResult.me().setSuccess(true).setMessage(deliveryService.createDelivery(dto));
 	}
+
+	/**
+	 * 获取采购单
+	 */
+	@PostMapping(value = "/getPurchase")
+	public AjaxResult getPurchase(@RequestBody PageDto in) {
+		return AjaxResult.me().setSuccess(true).setResultObj(deliveryService.getPurchase(in));
+	}
 }

zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java

@@ -1,5 +1,7 @@
 package com.cim.idm.dao;
 
+import com.cim.idm.model.MaterialReceiveRequest;
+import com.cim.idm.model.PurchaseDto;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
@@ -23,4 +25,12 @@ public interface DeliveryDao {
     int bindDelivery(@Param("siteName") String siteName,
                      @Param("receiveRequestName") String receiveRequestName,
                      @Param("nameList") List<String> nameList);
+
+    /**
+     * 获取采购订单
+     * @param dto 请求
+     * @return 采购订单
+     */
+    List<MaterialReceiveRequest> getPurchase(@Param("dto") PurchaseDto dto,
+                                             @Param("typeList") List<String> typeList);
 }

zi-wms-pda/src/main/java/com/cim/idm/model/PageDto.java

@@ -0,0 +1,11 @@
+package com.cim.idm.model;
+
+import lombok.Data;
+import com.alibaba.fastjson.JSONObject;
+
+@Data
+public class PageDto {
+	private Integer pageNum;
+	private Integer pageSize;
+	private JSONObject params;
+}

zi-wms-pda/src/main/java/com/cim/idm/model/PurchaseDto.java

@@ -0,0 +1,12 @@
+package com.cim.idm.model;
+
+import lombok.Data;
+
+@Data
+public class PurchaseDto {
+	// siteName
+	private String siteName;
+
+	// 单号名称
+	private String receiveRequestName;
+}

zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java

@@ -1,6 +1,9 @@
 package com.cim.idm.service;
 
 import com.cim.idm.model.DeliveryDto;
+import com.cim.idm.model.MaterialReceiveRequest;
+import com.cim.idm.model.PageDto;
+import com.github.pagehelper.PageInfo;
 
 public interface IDeliveryService {
     /**
@@ -9,4 +12,11 @@ public interface IDeliveryService {
      * @return 到货单
      */
     String createDelivery(DeliveryDto dto);
+
+    /**
+     * 获取采购订单
+     * @param dto 请求
+     * @return 采购订单
+     */
+    PageInfo<MaterialReceiveRequest> getPurchase(PageDto dto);
 }

zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java

@@ -1,10 +1,16 @@
 package com.cim.idm.service.Impl;
 
+import com.alibaba.fastjson.JSON;
 import com.cim.idm.constants.ReceiveTypeEnums;
 import com.cim.idm.dao.DeliveryDao;
 import com.cim.idm.model.DeliveryDto;
+import com.cim.idm.model.MaterialReceiveRequest;
+import com.cim.idm.model.PageDto;
+import com.cim.idm.model.PurchaseDto;
 import com.cim.idm.service.IDeliveryService;
 import com.cim.idm.wmspackage.invoice.management.data.MaterialReceiveRequestKey;
+import com.github.pagehelper.PageInfo;
+import com.github.pagehelper.page.PageMethod;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -32,4 +38,11 @@ public class DeliveryServiceImpl implements IDeliveryService {
         deliveryDao.bindDelivery(dto.getSiteName(), dto.getReceiveRequestName(), collect);
         return "更新成功";
     }
+
+    @Override
+    public PageInfo<MaterialReceiveRequest> getPurchase(PageDto dto) {
+        PageMethod.startPage(dto.getPageNum(), dto.getPageSize());
+        PurchaseDto purchaseDto = JSON.toJavaObject(dto.getParams(), PurchaseDto.class);
+        return new PageInfo<>(deliveryDao.getPurchase(purchaseDto, ReceiveTypeEnums.getPurchase()));
+    }
 }

zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml

@@ -15,4 +15,16 @@
             #{name}
         </foreach>
     </update>
+
+    <select id="getPurchase" resultType="com.cim.idm.model.MaterialReceiveRequest">
+        SELECT SITENAME, RECEIVEREQUESTNAME FROM MATERIALRECEIVEREQUEST
+        WHERE SITENAME = #{dto.siteName}
+        AND RECEIVEREQUESTTYPE IN
+        <foreach item="type" index="index" collection="typeList" open="(" separator="," close=")">
+            #{type}
+        </foreach>
+        <if test="dto.receiveRequestName != null and dto.receiveRequestName != ''">
+            AND RECEIVEREQUESTNAME LIKE '%'||#{dto.receiveRequestName}||'%'
+        </if>
+    </select>
 </mapper>