在库订单服务类型搜索维护

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -454,6 +454,9 @@
             <if test=" param.waybillNumLike != '' and param.waybillNumLike != null  ">and ldsa.waybill_number like
                 concat('%',#{param.waybillNumLike},'%')
             </if>
+            <if test=" param.typeService != '' and param.typeService != null  ">
+                and ldsa.type_service = #{param.typeService}
+            </if>
             <if test=" param.warehouseIdList != null  ">and ldsa.warehouse_id in
                 <foreach collection="param.warehouseIdList" open="(" item="a" close=")" separator=",">
                     #{a}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@@ -840,6 +840,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	@Override
 	public IPage<DistributionStockArticleEntity> pageListOwe(IPage<Object> page, Map<String, Object> distributionStockArticle) {
 		DistributionStockArticleOweDTO stockArticleEntity = JSONObject.parseObject(JSONObject.toJSONString(distributionStockArticle), DistributionStockArticleOweDTO.class);
+		if (Func.isNotEmpty(distributionStockArticle.get("typeServer"))){
+			stockArticleEntity.setTypeService((String) distributionStockArticle.get("typeServer"));
+		}
 		if (Func.isNotEmpty(stockArticleEntity.getOrderCodeNum())) {
 			String anumbering = stockArticleEntity.getOrderCodeNum().trim();
 			List<String> list = CommonUtil.stringNum(anumbering);