给单据增加关联单据的查询条件

jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java

@@ -24,6 +24,7 @@ public interface DepotHeadMapperEx {
             @Param("creatorArray") String[] creatorArray,
             @Param("statusArray") String[] statusArray,
             @Param("number") String number,
+            @Param("linkNumber") String linkNumber,
             @Param("beginTime") String beginTime,
             @Param("endTime") String endTime,
             @Param("materialParam") String materialParam,
@@ -40,6 +41,7 @@ public interface DepotHeadMapperEx {
             @Param("creatorArray") String[] creatorArray,
             @Param("statusArray") String[] statusArray,
             @Param("number") String number,
+            @Param("linkNumber") String linkNumber,
             @Param("beginTime") String beginTime,
             @Param("endTime") String endTime,
             @Param("materialParam") String materialParam,

jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java

@@ -36,13 +36,14 @@ public class DepotHeadComponent implements ICommonQuery {
         String roleType = StringUtil.getInfo(search, "roleType");
         String status = StringUtil.getInfo(search, "status");
         String number = StringUtil.getInfo(search, "number");
+        String linkNumber = StringUtil.getInfo(search, "linkNumber");
         String beginTime = StringUtil.getInfo(search, "beginTime");
         String endTime = StringUtil.getInfo(search, "endTime");
         String materialParam = StringUtil.getInfo(search, "materialParam");
         Long organId = StringUtil.parseStrLong(StringUtil.getInfo(search, "organId"));
         Long creator = StringUtil.parseStrLong(StringUtil.getInfo(search, "creator"));
         Long depotId = StringUtil.parseStrLong(StringUtil.getInfo(search, "depotId"));
-        return depotHeadService.select(type, subType, roleType, status, number, beginTime, endTime, materialParam,
+        return depotHeadService.select(type, subType, roleType, status, number, linkNumber, beginTime, endTime, materialParam,
                 organId, creator, depotId, QueryUtils.offset(map), QueryUtils.rows(map));
     }
 
@@ -54,13 +55,14 @@ public class DepotHeadComponent implements ICommonQuery {
         String roleType = StringUtil.getInfo(search, "roleType");
         String status = StringUtil.getInfo(search, "status");
         String number = StringUtil.getInfo(search, "number");
+        String linkNumber = StringUtil.getInfo(search, "linkNumber");
         String beginTime = StringUtil.getInfo(search, "beginTime");
         String endTime = StringUtil.getInfo(search, "endTime");
         String materialParam = StringUtil.getInfo(search, "materialParam");
         Long organId = StringUtil.parseStrLong(StringUtil.getInfo(search, "organId"));
         Long creator = StringUtil.parseStrLong(StringUtil.getInfo(search, "creator"));
         Long depotId = StringUtil.parseStrLong(StringUtil.getInfo(search, "depotId"));
-        return depotHeadService.countDepotHead(type, subType, roleType, status, number, beginTime, endTime, materialParam,
+        return depotHeadService.countDepotHead(type, subType, roleType, status, number, linkNumber, beginTime, endTime, materialParam,
                 organId, creator, depotId);
     }
 

jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java

@@ -100,8 +100,8 @@ public class DepotHeadService {
         return list;
     }
 
-    public List<DepotHeadVo4List> select(String type, String subType, String roleType, String status, String number, String beginTime, String endTime,
-               String materialParam, Long organId, Long creator, Long depotId, int offset, int rows)throws Exception {
+    public List<DepotHeadVo4List> select(String type, String subType, String roleType, String status, String number, String linkNumber,
+           String beginTime, String endTime, String materialParam, Long organId, Long creator, Long depotId, int offset, int rows) throws Exception {
         List<DepotHeadVo4List> resList = new ArrayList<>();
         List<DepotHeadVo4List> list=new ArrayList<>();
         try{
@@ -112,7 +112,7 @@ public class DepotHeadService {
             Map<Long,String> accountMap = accountService.getAccountMap();
             beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME);
             endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
-            list=depotHeadMapperEx.selectByConditionDepotHead(type, subType, creatorArray, statusArray, number, beginTime, endTime,
+            list=depotHeadMapperEx.selectByConditionDepotHead(type, subType, creatorArray, statusArray, number, linkNumber, beginTime, endTime,
                  materialParam, organId, creator, depotId, depotArray, offset, rows);
             if (null != list) {
                 for (DepotHeadVo4List dh : list) {
@@ -150,8 +150,8 @@ public class DepotHeadService {
         return resList;
     }
 
-    public Long countDepotHead(String type, String subType, String roleType, String status, String number, String beginTime, String endTime,
-                String materialParam, Long organId, Long creator, Long depotId) throws Exception{
+    public Long countDepotHead(String type, String subType, String roleType, String status, String number, String linkNumber,
+           String beginTime, String endTime, String materialParam, Long organId, Long creator, Long depotId) throws Exception{
         Long result=null;
         try{
             String [] depotArray = getDepotArray(subType);
@@ -159,7 +159,7 @@ public class DepotHeadService {
             String [] statusArray = StringUtil.isNotEmpty(status) ? status.split(",") : null;
             beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME);
             endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
-            result=depotHeadMapperEx.countsByDepotHead(type, subType, creatorArray, statusArray, number, beginTime, endTime,
+            result=depotHeadMapperEx.countsByDepotHead(type, subType, creatorArray, statusArray, number, linkNumber, beginTime, endTime,
                    materialParam, organId, creator, depotId, depotArray);
         }catch(Exception e){
             JshException.readFail(logger, e);

jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml

@@ -73,6 +73,10 @@
             <bind name="bindNumber" value="'%'+number+'%'"/>
             and dh.number like #{bindNumber}
         </if>
+        <if test="linkNumber != null">
+            <bind name="bindLinkNumber" value="'%'+linkNumber+'%'"/>
+            and dh.link_number like #{bindLinkNumber}
+        </if>
         <if test="beginTime != null">
             and dh.oper_time >= #{beginTime}
         </if>
@@ -137,6 +141,10 @@
             <bind name="bindNumber" value="'%'+number+'%'"/>
             and dh.number like #{bindNumber}
         </if>
+        <if test="linkNumber != null">
+            <bind name="bindLinkNumber" value="'%'+linkNumber+'%'"/>
+            and dh.link_number like #{bindLinkNumber}
+        </if>
         <if test="beginTime != null">
             and dh.oper_time >= #{beginTime}
         </if>