第1.1版

src/main/java/org/rcisoft/bus/wmsgoodsstock/controller/WmsGoodsStockController.java

@@ -120,7 +120,7 @@ public class WmsGoodsStockController extends CyPaginationController<WmsGoodsStoc
     @CyOpeLogAnno(title = "system-库存管理表管理-查询库存管理表", businessType = CyLogTypeEnum.QUERY)
     @ApiOperation(value="分页查询库存管理表集合", notes="分页查询库存管理表集合")
     @GetMapping(value = "/list")
-    public CyGridModel listByPagination(WmsGoodsStock wmsGoodsStock) {
+    public CyGridModel listByPagination(WmsGoodsStockPageResultsDto wmsGoodsStock) {
         wmsGoodsStockServiceImpl.findAllByPagination(getPaginationUtility(), wmsGoodsStock);
         return getGridModelResponse();
     }

src/main/java/org/rcisoft/bus/wmsgoodsstock/dao/WmsGoodsStockRepository.java

@@ -25,6 +25,6 @@ public interface WmsGoodsStockRepository extends CyBaseMapper<WmsGoodsStock> {
     * 分页查询 wmsGoodsStock
     *
     */
-    IPage<WmsGoodsStockPageResultsDto> queryWmsGoodsStocksPaged(CyPageInfo cyPageInfo, @Param("entity") WmsGoodsStock wmsGoodsStock);
+    IPage<WmsGoodsStockPageResultsDto> queryWmsGoodsStocksPaged(CyPageInfo cyPageInfo, @Param("entity") WmsGoodsStockPageResultsDto wmsGoodsStock);
 }
 

src/main/java/org/rcisoft/bus/wmsgoodsstock/service/WmsGoodsStockService.java

@@ -56,7 +56,7 @@ public interface WmsGoodsStockService {
     * @return
     */
     IPage<WmsGoodsStockPageResultsDto> findAllByPagination(CyPageInfo<WmsGoodsStockPageResultsDto> paginationUtility,
-              WmsGoodsStock wmsGoodsStock);
+                                                           WmsGoodsStockPageResultsDto wmsGoodsStock);
 
 
     /**

src/main/java/org/rcisoft/bus/wmsgoodsstock/service/impl/WmsGoodsStockServiceImpl.java

@@ -108,7 +108,7 @@ public class WmsGoodsStockServiceImpl extends ServiceImpl<WmsGoodsStockRepositor
     */
     @Override
     public IPage<WmsGoodsStockPageResultsDto> findAllByPagination(CyPageInfo<WmsGoodsStockPageResultsDto> paginationUtility,
-                                                                  WmsGoodsStock wmsGoodsStock){
+                                                                  WmsGoodsStockPageResultsDto wmsGoodsStock){
         return baseMapper.queryWmsGoodsStocksPaged(paginationUtility,wmsGoodsStock);
 
     }

src/main/resources/application-spbt.yml

@@ -109,7 +109,7 @@ cy:
       stringOutputType: base64
 global:
   path:
-    base_upload_location: \working\resource\eduServer
+    base_upload_location: D:\14406\Pictures
     base_discovery: 'http://192.168.1.12:8888/eduServer/'
     code_generate_location: /code
     video_location: /video

src/main/resources/mapper/bus/wmsGoodsApply/WmsGoodsApplyMapper.xml

@@ -89,7 +89,7 @@
                 and shipper_address like concat('%',#{entity.shipperAddress},'%')
             </if>
             <if test="entity.shipperPhone !=null and entity.shipperPhone != '' ">
-                and shipper_phone = #{entity.shipperPhone}
+                and shipper_phone  like concat('%',#{entity.shipperPhone},'%')
             </if>
             <if test="entity.goodsCheck !=null and entity.goodsCheck != '' ">
                 and goods_check = #{entity.goodsCheck}
@@ -153,7 +153,7 @@
                 and shipper_address like concat('%',#{entity.shipperAddress},'%')
             </if>
             <if test="entity.shipperPhone !=null and entity.shipperPhone != '' ">
-                and shipper_phone = #{entity.shipperPhone}
+                and shipper_phone  like concat('%',#{entity.shipperPhone},'%')
             </if>
             <if test="entity.goodsCheck !=null and entity.goodsCheck != '' ">
                 and goods_check = #{entity.goodsCheck}

src/main/resources/mapper/bus/wmsGoodsStock/WmsGoodsStockMapper.xml

@@ -38,19 +38,28 @@
 
     <!--<cache type="${corePackag!}.util.RedisCache"/>-->
     <select id="queryWmsGoodsStocks" resultMap="BaseResultMap">
-        select * from wms_goods_stock
-        where 1=1
-        and del_flag = '0'
+        select wgs.*,
+        wg.goods_name,
+        wg.goods_code,
+        wg.goods_type,
+        wg.goods_article_number,
+        wg.goods_subclass,
+        wg.goods_colour,
+        wg.goods_norms,
+        wg.goods_size
+        from wms_goods_stock wgs left join wms_goods wg on wg.business_id = wgs.goods_id
+        where wgs.del_flag = '0'
+        and wg.del_flag = '0'
         <if test="entity.flag !=null and entity.flag != '' ">
-            and flag = #{entity.flag}
+            and wgs.flag = #{entity.flag}
         </if>
         <if test="entity.goodsId !=null and entity.goodsId != '' ">
-            and goods_id = #{entity.goodsId}
+            and wgs.goods_id = #{entity.goodsId}
         </if>
         <if test="entity.goodsCounts !=null and entity.goodsCounts != '' ">
-            and goods_counts = #{entity.goodsCounts}
+            and wgs.goods_counts = #{entity.goodsCounts}
         </if>
-        ORDER BY business_id DESC
+        ORDER BY wg.business_id DESC
     </select>
 
     <select id="queryWmsGoodsStocksPaged" resultMap="BasePageResultMap">
@@ -78,6 +87,27 @@
         <if test="entity.goodsCounts !=null and entity.goodsCounts != '' ">
             and wgs.goods_counts = #{entity.goodsCounts}
         </if>
+        <if test="entity.goodsCode !=null and entity.goodsCode != '' ">
+            and wg.goods_code = #{entity.goodsCode}
+        </if>
+        <if test="entity.goodsType !=null and entity.goodsType != '' ">
+            and wg.goods_type = #{entity.goodsType}
+        </if>
+        <if test="entity.goodsArticleNumber !=null and entity.goodsArticleNumber != '' ">
+            and wg.goods_article_number = #{entity.goodsArticleNumber}
+        </if>
+        <if test="entity.goodsSubclass !=null and entity.goodsSubclass != '' ">
+            and wg.goods_subclass = #{entity.goodsSubclass}
+        </if>
+        <if test="entity.goodsColour !=null and entity.goodsColour != '' ">
+            and wg.goods_colour = #{entity.goodsColour}
+        </if>
+        <if test="entity.goodsNorms !=null and entity.goodsNorms != '' ">
+            and wg.goods_norms = #{entity.goodsNorms}
+        </if>
+        <if test="entity.goodsSize !=null and entity.goodsSize != '' ">
+            and wg.goods_size = #{entity.goodsSize}
+        </if>
         ORDER BY wgs.business_id DESC
     </select>
 </mapper>