36b09673 康伟

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

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