aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

demand: 批次规则批量修改，扫描漏组批次过滤线路014

Browse Source 
committer: heyu
This commit is contained in:
aike 2025-06-30 15:10:37 +08:00
parent 9385acb73c
commit a5e8836d14
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransPlanRuleMapper.java
View File

@ -153,11 +153,10 @@ public interface EmisTransPlanRuleMapper {
* *
* @param emisTransPlanRule 查询条件 * @param emisTransPlanRule 查询条件
* @param offset 偏移量 * @param offset 偏移量
* @param limit 每页数量 * @param pageSize 每页数量
* @return 供应商线路规划集合 * @return 供应商线路规划集合
*/ */
List<EmisTransPlanRule> selectRulesForAllScanPaged(@Param("emisTransPlanRule") EmisTransPlanRule emisTransPlanRule, List<EmisTransPlanRule> selectRulesForAllScanPaged(@Param("emisTransPlanRule") EmisTransPlanRule emisTransPlanRule, @Param("offset") int offset, @Param("pageSize") int pageSize);
@Param("offset") int offset, @Param("limit") int limit);
/** /**
* 查询总数（多线程分页用） * 查询总数（多线程分页用）

4
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -1131,6 +1131,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWaybillSave.setCalcFeeType("3"); emisWaybillSave.setCalcFeeType("3");
} }
if (StringUtils.isNotEmpty(emisWaybillSave.getMasterBillCode())) {
emisWaybillSave.setMasterBillCode(emisWaybillSave.getMasterBillCode());
}
} }
private List<SysUser> getPayeeList(String userName) { private List<SysUser> getPayeeList(String userName) {

5
emis-biz/src/main/resources/mapper/EmisTransPlanRuleMapper.xml
View File

@ -335,10 +335,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="emisTransPlanRule.supplierCode != null and emisTransPlanRule.supplierCode != ''">and ( FIND_IN_SET(#{emisTransPlanRule.supplierCode},r.supplier_code) )</if> <if test="emisTransPlanRule.supplierCode != null and emisTransPlanRule.supplierCode != ''">and ( FIND_IN_SET(#{emisTransPlanRule.supplierCode},r.supplier_code) )</if>
<if test="emisTransPlanRule.startDate != null">and r.start_date = #{emisTransPlanRule.startDate}</if> <if test="emisTransPlanRule.startDate != null">and r.start_date = #{emisTransPlanRule.startDate}</if>
<if test="emisTransPlanRule.endDate != null">and r.end_date = #{emisTransPlanRule.endDate}</if> <if test="emisTransPlanRule.endDate != null">and r.end_date = #{emisTransPlanRule.endDate}</if>
and r.line_code!='014' and r.line_code not in ('014','012','077')
</where> </where>
order by id desc order by id desc
limit #{limit} offset #{offset} limit #{offset}, #{pageSize}
</select> </select>
<select id="countForAllScan" resultType="int"> <select id="countForAllScan" resultType="int">
@ -354,6 +354,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="supplierCode != null and supplierCode != ''">and ( FIND_IN_SET(#{supplierCode},r.supplier_code) )</if> <if test="supplierCode != null and supplierCode != ''">and ( FIND_IN_SET(#{supplierCode},r.supplier_code) )</if>
<if test="startDate != null">and r.start_date = #{startDate}</if> <if test="startDate != null">and r.start_date = #{startDate}</if>
<if test="endDate != null">and r.end_date = #{endDate}</if> <if test="endDate != null">and r.end_date = #{endDate}</if>
and r.line_code not in ('014','012','077')
</where> </where>
</select> </select>