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

Merge pull request 'develop' (#257) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/257
This commit is contained in:
heyu 2025-12-06 16:26:50 +08:00
commit 61698ef6fd
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java
View File

@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.xdadan.erp.common.annotation.Log; import com.xdadan.erp.common.annotation.Log;
@ -127,7 +128,7 @@ public class EmisTmsSiteBatchController extends EmisBaseController
*/ */
@GetMapping("/scanSiteBatchV2") @GetMapping("/scanSiteBatchV2")
// @PreAuthorize("@ss.hasPermi('emis:emisTmsSiteBatch:scanSiteBatch')") // @PreAuthorize("@ss.hasPermi('emis:emisTmsSiteBatch:scanSiteBatch')")
public AjaxResult scanSiteBatchV2(String batchNo) { public AjaxResult scanSiteBatchV2(@RequestParam("batchNo") String batchNo) {
emisTmsSiteBatchService.scanSiteBatchV2(batchNo); emisTmsSiteBatchService.scanSiteBatchV2(batchNo);
return AjaxResult.success("发送成功"); return AjaxResult.success("发送成功");

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java
View File

@ -724,7 +724,7 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements
List<String> failedBillCodes = new ArrayList<>(); List<String> failedBillCodes = new ArrayList<>();
// 获取所有线路规划 // 获取所有线路规划
List<EmisTransPlanRule> treeRules = this.selectEmisTransPlanRuleTree(lineCodes); List<EmisTransPlanRule> treeRules = emisTransPlanRuleMapper.selectEmisTransPlanRuleByLineCodes(lineCodes);
if (treeRules.isEmpty()) { if (treeRules.isEmpty()) {
log.info("No trans plan rules found, skip auto scan v2"); log.info("No trans plan rules found, skip auto scan v2");
return; return;

4
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -2584,8 +2584,8 @@
<if test="dispatchUnderlingSiteCode != null and dispatchUnderlingSiteCode != ''"> and dispatch_underling_site_code=#{dispatchUnderlingSiteCode}</if> <if test="dispatchUnderlingSiteCode != null and dispatchUnderlingSiteCode != ''"> and dispatch_underling_site_code=#{dispatchUnderlingSiteCode}</if>
<if test="destinationCenterCode != null and destinationCenterCode != ''"> and destination_center_code=#{destinationCenterCode}</if> <if test="destinationCenterCode != null and destinationCenterCode != ''"> and destination_center_code=#{destinationCenterCode}</if>
<if test="marketManCode != null and marketManCode != ''"> and market_man_code = #{marketManCode}</if> <if test="marketManCode != null and marketManCode != ''"> and market_man_code = #{marketManCode}</if>
<if test="payee != null and payee != ''"> and payee=#{payee}</if> <if test="payee != null and payee != ''"> and a.payee=#{payee}</if>
<if test="salesmen != null and salesmen != ''"> and salesmen like concat('%', #{salesmen}, '%')</if> <if test="salesmen != null and salesmen != ''"> and a.salesmen like concat('%', #{salesmen}, '%')</if>
<if test="operateEmployeeCode != null and operateEmployeeCode != ''"> and operate_employee_code=#{operateEmployeeCode}</if> <if test="operateEmployeeCode != null and operateEmployeeCode != ''"> and operate_employee_code=#{operateEmployeeCode}</if>
<if test="blIsQuestion != null and blIsQuestion != ''"> and bl_is_question=#{blIsQuestion}</if> <if test="blIsQuestion != null and blIsQuestion != ''"> and bl_is_question=#{blIsQuestion}</if>
<if test="problemType != null and problemType != ''"> and problem_type=#{problemType}</if> <if test="problemType != null and problemType != ''"> and problem_type=#{problemType}</if>