36b09673 康伟

kangwei:合同变更校验货号,并修改提示语

1 个父辈 bc187e55
......@@ -149,9 +149,9 @@ public class PurchaseContractController {
if(purchaseContractEntity ==null) {
result.error500("未找到对应实体");
}else {
String errorMsg = purchaseContractService.checkPurchaseContract(purchaseContractVO , purchaseContractEntity.getContractCode(),1);
String errorMsg = purchaseContractService.checkPurchaseContract(purchaseContractVO , purchaseContractEntity.getContractCode(),0);
if(StringUtils.isNotEmpty( errorMsg )){
result.error500( errorMsg );
result.error500( "变更合同需要更改货号!" );
}else{
purchaseContractService.changePurchaseContract(purchaseContractVO);
result.success("修改成功!");
......@@ -229,7 +229,7 @@ public class PurchaseContractController {
result.error500("未找到对应实体");
}else {
if("1".equals(purchaseContract.getUseFlag())){
result.error500("合同状态是:[未启用],不能提交审!");
result.error500("合同状态是:[未启用],不能提交审!");
}else{
purchaseContract.setStatus("1");
purchaseContract.setApplyUser(BaseContextHandler.getUserId());
......
......@@ -168,6 +168,7 @@ public class ERPPurchaseContractServiceImpl extends ServiceImpl<ERPPurchaseContr
purchaseContractVO.setOldContractId(oldContractId);
purchaseContractVO.setId(null);
purchaseContractVO.setUseFlag("0");
this.baseMapper.insert( purchaseContractVO );
//计算采购金额
String purchaseMoney = "0";
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!