demand: TMS-运单修改/网点费用申请:如果该运单已经租过批次,在申请修改产品类型时保存时提示该运单已组批次,先移除批次再修改
This commit is contained in:
parent
06fc5297bb
commit
c25bf2c567
@ -14,6 +14,7 @@ package com.xdadan.erp.emis.service.impl;
|
|||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.alibaba.fastjson.JSONArray;
|
import com.alibaba.fastjson.JSONArray;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
|
import com.beust.jcommander.internal.Lists;
|
||||||
import com.deepoove.poi.XWPFTemplate;
|
import com.deepoove.poi.XWPFTemplate;
|
||||||
import com.deepoove.poi.config.Configure;
|
import com.deepoove.poi.config.Configure;
|
||||||
import com.deepoove.poi.data.PictureType;
|
import com.deepoove.poi.data.PictureType;
|
||||||
@ -3814,6 +3815,13 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
|
|||||||
@Override
|
@Override
|
||||||
public void reUpdateWayBill(EmisWaybill oldEmisWaybill,EmisWaybill emisWaybillSave,Boolean needUpdateAttach,Boolean isForce) throws EmisBizError {
|
public void reUpdateWayBill(EmisWaybill oldEmisWaybill,EmisWaybill emisWaybillSave,Boolean needUpdateAttach,Boolean isForce) throws EmisBizError {
|
||||||
|
|
||||||
|
if(!emisWaybillSave.getProductType().equals(oldEmisWaybill.getProductType())){
|
||||||
|
List<EmisTmsSiteBatch> batchList = emisTmsSiteBatchMapper.selectEmisTmsSiteBatchListByBillCodes(
|
||||||
|
Lists.newArrayList(Collections.singleton(emisWaybillSave.getBillCode())));
|
||||||
|
if (CollectionUtil.isNotEmpty(batchList)) {
|
||||||
|
throw new EmisBizError(EmisBizErrorType.FAIL, "该单号已经录入批次,请先在组批次中剔除该运单");
|
||||||
|
}
|
||||||
|
}
|
||||||
// 公共计算部分
|
// 公共计算部分
|
||||||
emisWaybillSave.setId(oldEmisWaybill.getId());
|
emisWaybillSave.setId(oldEmisWaybill.getId());
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user