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

demand: TMS系统 - 寄件运单查询/寄件运单查询新/派件运单查询/中心运单查询 -已停用的月结客户 允许模糊搜索选择，并支持查询相关数据 货物组批次返货虚拟单不允许组批次

Browse Source 
committer: heyu
This commit is contained in:
aike 2025-07-17 17:43:33 +08:00
parent 1bd42c16af
commit ad0899408f
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java
View File

@ -74,7 +74,7 @@ public class EmisMonthpayAccountController extends EmisBaseController
* @param emisCustomerUser * @param emisCustomerUser
* @return * @return
*/ */
@JacksonFilter(include= {"customerCode","custNo","custName","payee","salesmen","payeeName","salesmenName"},value= EmisCustomerUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @JacksonFilter(include= {"customerCode","custNo","custName","payee","salesmen","payeeName","salesmenName","status"},value= EmisCustomerUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@GetMapping("/listAllSimple") @GetMapping("/listAllSimple")
public TableDataInfo listAllSimple(EmisCustomerUser emisCustomerUser) public TableDataInfo listAllSimple(EmisCustomerUser emisCustomerUser)
{ {

18
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchServiceImpl.java
View File

@ -147,13 +147,25 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi
public void checkSiteBatch(EmisTmsSiteBatch oldSiteBatch, String billCode) throws EmisBizError { public void checkSiteBatch(EmisTmsSiteBatch oldSiteBatch, String billCode) throws EmisBizError {
EmisWaybill emisWaybill = emisWaybillMapper.selectEmisWaybillByBillCode(billCode); EmisWaybill emisWaybill = emisWaybillMapper.selectEmisWaybillByBillCode(billCode);
if (Objects.nonNull(emisWaybill) && StringUtil.isNotBlank(emisWaybill.getVirtualRemark())) { checkVirtual(billCode, emisWaybill);
throw new EmisBizError(EmisBizErrorType.FAIL, billCode + "已绑定虚拟单，无法录入批次");
}
checkTransPlanRule(oldSiteBatch, emisWaybill); checkTransPlanRule(oldSiteBatch, emisWaybill);
checkUnique(oldSiteBatch, billCode); checkUnique(oldSiteBatch, billCode);
} }
private static void checkVirtual(String billCode, EmisWaybill emisWaybill) throws EmisBizError {
if (Objects.isNull(emisWaybill)) {
return;
}
if ("0086".equals(emisWaybill.getSendCountry())) {
if (StringUtil.isNotBlank(emisWaybill.getVirtualRemark())) {
throw new EmisBizError(EmisBizErrorType.FAIL, billCode + "已绑定虚拟单，无法录入批次");
}
}
if ("0086".equals(emisWaybill.getReceiveCountry()) && "1".equals(emisWaybill.getBlVirtual())) {
throw new EmisBizError(EmisBizErrorType.FAIL, billCode + "返货虚拟单，无法录入批次");
}
}
private void checkTransPlanRule(EmisTmsSiteBatch oldSiteBatch, EmisWaybill emisWaybill) throws EmisBizError { private void checkTransPlanRule(EmisTmsSiteBatch oldSiteBatch, EmisWaybill emisWaybill) throws EmisBizError {
EmisTransPlanRule emisTransPlanRule = new EmisTransPlanRule(); EmisTransPlanRule emisTransPlanRule = new EmisTransPlanRule();
emisTransPlanRule.setStartSiteCode(oldSiteBatch.getStartSiteCode()); emisTransPlanRule.setStartSiteCode(oldSiteBatch.getStartSiteCode());