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

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

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/188
This commit is contained in:
heyu 2025-09-16 18:06:21 +08:00
commit 384fdc9d42
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java
View File

@ -1,11 +1,11 @@
/** /**
* @Project: emis * @Project: emis
* @Title: EmisWaybillTransferController.java * @Title: EmisWaybillTransferController.java
* @author linfso * @author linfso
* @date 2024-05-22 01:07:48 * @date 2024-05-22 01:07:48
* @Copyright: ShangHai Duta 2022 All rights reserved. * @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0 * @version v1.0
* @Description: <p> 运单转件表 控制器 </p> * @Description: <p> 运单转件表 控制器 </p>
*/ */
@ -50,7 +50,7 @@ import com.xdadan.erp.emis.service.IEmisWaybillTransferService;
/** /**
* 运单转件表Controller * 运单转件表Controller
* *
* @author linfso * @author linfso
* @date 2024-05-22 01:07:48 * @date 2024-05-22 01:07:48
*/ */
@ -151,6 +151,17 @@ public class EmisWaybillTransferController extends EmisBaseController
return AjaxResult.error(" 运单号,转件单号,转件时间,目的城市,转件公司必填!"); return AjaxResult.error(" 运单号,转件单号,转件时间,目的城市,转件公司必填!");
} }
// 校验转单号格式：只允许英文和数字，长度6-32位
String transferBillCode = emisWaybillTransfer.getTransferBillCode();
if (StringUtils.isNotEmpty(transferBillCode)) {
if (!transferBillCode.matches("^[a-zA-Z0-9]+$")) {
return AjaxResult.error("转单号只允许填写英文和数字!");
}
if (transferBillCode.length() < 6 || transferBillCode.length() > 32) {
return AjaxResult.error("转单号长度必须在6-32位之间!");
}
}
// int ret=emisWaybillTransferService.insertEmisWaybillTransfer(emisWaybillTransfer); // int ret=emisWaybillTransferService.insertEmisWaybillTransfer(emisWaybillTransfer);
EmisWaybillTransfer query = new EmisWaybillTransfer(); EmisWaybillTransfer query = new EmisWaybillTransfer();
query.setBillCode(emisWaybillTransfer.getBillCode()); query.setBillCode(emisWaybillTransfer.getBillCode());