1

pom.xml

@@ -168,6 +168,13 @@
 		    <artifactId>fastjson</artifactId>
 		    <version>1.2.4</version>
 		</dependency>
+		<!-- lombok-->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.22</version>
+            <scope>provided</scope>
+        </dependency>
 	</dependencies>
 
 	<dependencyManagement>

src/main/java/com/chinaitop/depot/storage/controller/StorageChangeStoragehouseRopController.java

@@ -124,10 +124,12 @@ public class StorageChangeStoragehouseRopController {
 			@ApiImplicitParam(name = "applyTimeB", value = "申请日期B", paramType = "query"),
 			@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query"),
 			@ApiImplicitParam(name = "dcch", value = "导出仓号", paramType = "query"),
-			@ApiImplicitParam(name = "dchwh", value = "导出货位号", paramType = "query")
+			@ApiImplicitParam(name = "dchwh", value = "导出货位号", paramType = "query"),
+			@ApiImplicitParam(name = "drch", value = "导入仓号", paramType = "query"),
+			@ApiImplicitParam(name = "drhwh", value = "导入货位号", paramType = "query")
 	})
 	public PageInfo<StorageChangeStoragehouseRop> getListRop(Integer pageNum, Integer pageSize, String changehouseNo,
-		String applyTimeA, String applyTimeB, Integer orgId, Integer dcch, Integer dchwh) {
+		String applyTimeA, String applyTimeB, Integer orgId, Integer dcch, Integer dchwh, Integer drch, Integer drhwh) {
 		StorageChangeStoragehouseRopExample StorageChangeStoragehouseRopExample = new StorageChangeStoragehouseRopExample();
 		com.chinaitop.depot.storage.model.StorageChangeStoragehouseRopExample.Criteria Criteria = StorageChangeStoragehouseRopExample.createCriteria();
 		if (pageNum != null && pageSize != null) {
@@ -155,6 +157,12 @@ public class StorageChangeStoragehouseRopController {
 		if (null != dchwh) {
 			Criteria.andOutWarehouseEqualTo(dchwh);
 		}
+		if (null != drch) {
+			Criteria.andIntoStorehouseEqualTo(drch);
+		}
+		if (null != drhwh) {
+			Criteria.andIntoWarehouseEqualTo(drhwh);
+		}
 		StorageChangeStoragehouseRopExample.setOrderByClause("create_time asc");
 		List<StorageChangeStoragehouseRop> list = storageChangeStoragehouseRopService.selectByExample(StorageChangeStoragehouseRopExample);
 		PageInfo<StorageChangeStoragehouseRop> pageInfo = new PageInfo<StorageChangeStoragehouseRop>(list);

src/main/java/com/chinaitop/depot/storage/mapper/TVentilationOperationMapper.java

@@ -7,91 +7,20 @@ import com.chinaitop.depot.storage.model.TVentilationOperation;
 import com.chinaitop.depot.storage.model.TVentilationOperationExample;
 
 public interface TVentilationOperationMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_ventilation_operation
-     *
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
-     */
+
     int countByExample(TVentilationOperationExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_ventilation_operation
-     *
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
-     */
     int deleteByExample(TVentilationOperationExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_ventilation_operation
-     *
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
-     */
     int deleteByPrimaryKey(String id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_ventilation_operation
-     *
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
-     */
     int insert(TVentilationOperation record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_ventilation_operation
-     *
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
-     */
-    int insertSelective(TVentilationOperation record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_ventilation_operation
-     *
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
-     */
     List<TVentilationOperation> selectByExample(TVentilationOperationExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_ventilation_operation
-     *
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
-     */
     TVentilationOperation selectByPrimaryKey(String id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_ventilation_operation
-     *
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
-     */
-    int updateByExampleSelective(@Param("record") TVentilationOperation record, @Param("example") TVentilationOperationExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_ventilation_operation
-     *
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
-     */
-    int updateByExample(@Param("record") TVentilationOperation record, @Param("example") TVentilationOperationExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_ventilation_operation
-     *
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
-     */
     int updateByPrimaryKeySelective(TVentilationOperation record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_ventilation_operation
-     *
-     * @mbggenerated Sun Jun 28 17:44:27 CST 2020
-     */
     int updateByPrimaryKey(TVentilationOperation record);
 }