xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'123'

This commit is contained in:
xd 2024-04-11 09:27:35 +08:00
parent 5ce44c47af
commit e559427345
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
View File

@ -92,6 +92,7 @@ public class QuotController extends BaseController
quot.setQuotId(UUID.fastUUID().toString()); quot.setQuotId(UUID.fastUUID().toString());
quot.setQuotCode(IdUtils.createNo("BJD_",2)); quot.setQuotCode(IdUtils.createNo("BJD_",2));
quot.setCreateBy(getUsername()); quot.setCreateBy(getUsername());
quot.setUpdateBy(getUsername());
return toAjax(quotService.insertQuot(quot)); return toAjax(quotService.insertQuot(quot));
} }
@ -197,18 +198,17 @@ public class QuotController extends BaseController
public AjaxResult commitQuot(@RequestBody Quot quot) public AjaxResult commitQuot(@RequestBody Quot quot)
{ {
String quot_id = quot.getQuotId(); String quot_id = quot.getQuotId();
quot.setUpdateBy(getUsername());
quot.setQuotApprovalStatus("1");//报价单 状态设置为 协助中
quot.setQuotInquiryDate(DateUtils.getNowDate());//报价单 询价日期设置为 当前日期
if(StringUtils.isEmpty(quot_id)){ if(StringUtils.isEmpty(quot_id)){
quot.setQuotId(UUID.fastUUID().toString()); quot.setQuotId(UUID.fastUUID().toString());
quot.setQuotCode(IdUtils.createNo("BJD_",2)); quot.setQuotCode(IdUtils.createNo("BJD_",2));
quot.setCreateBy(getUsername()); quot.setCreateBy(getUsername());
quot.setQuotApprovalStatus("1");//报价单 状态设置为 协助中
quot.setQuotInquiryDate(DateUtils.getNowDate());//报价单 询价日期设置为 当前日期
quotService.insertQuot(quot); quotService.insertQuot(quot);
return success(); return success();
}else{ }else{
quot.setUpdateBy(getUsername());
quot.setQuotApprovalStatus("1");//报价单 状态设置为 协助中
quot.setQuotInquiryDate(DateUtils.getNowDate());//报价单 询价日期设置为 当前日期
quotService.updateQuot(quot); quotService.updateQuot(quot);
return success(); return success();
} }
@ -258,6 +258,7 @@ public class QuotController extends BaseController
} }
quotJsqr.setCreateBy(getUsername()); quotJsqr.setCreateBy(getUsername());
quotJsqr.setUpdateBy(getUsername());
quotJsqrService.insertQuotJsqr(quotJsqr);//生成报价单-技术确认单 quotJsqrService.insertQuotJsqr(quotJsqr);//生成报价单-技术确认单
quot.setQuotJsxzConfirmId(quotJsqrId); quot.setQuotJsxzConfirmId(quotJsqrId);

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java
View File

@ -322,7 +322,7 @@ public class QuotJsqrController extends BaseController
} }
} }
if(!qtFlag){ if(!qtFlag){
return error("其他协助还未完成"); return error("其他(防火、轨道、架空)协助还未完成");
} }
quot.setQuotJsxzApprovalStatus("2");//报价单-技术协助状态 设置为 已协助 quot.setQuotJsxzApprovalStatus("2");//报价单-技术协助状态 设置为 已协助
} }

1
ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java
View File

@ -63,6 +63,7 @@ public class QuotServiceImpl implements IQuotService
public int insertQuot(Quot quot) public int insertQuot(Quot quot)
{ {
quot.setCreateTime(DateUtils.getNowDate()); quot.setCreateTime(DateUtils.getNowDate());
quot.setUpdateTime(DateUtils.getNowDate());
int rows = quotMapper.insertQuot(quot); int rows = quotMapper.insertQuot(quot);
insertQuotMaterial(quot); insertQuotMaterial(quot);
return rows; return rows;