feat(bid): 完成招投标业务模块多需求迭代
本次提交包含多项功能改进与业务优化: 1. 全局主题色替换为#4A6FA5,统一前端UI风格 2. 新增客户报价单clientId字段,完善客户报价数据结构 3. 实现发货单状态流转功能,支持发货、完成、撤回、设置结单日期操作 4. 新增物料发货记录多表关联查询功能 5. 优化客户管理页面UI布局与交互体验 6. 修复客户报价表单自动补全逻辑,关联clientId与clientName 7. 补充租户ID自动填充逻辑,完善多租户数据隔离
This commit is contained in:
@@ -37,6 +37,11 @@ public class BizClientController extends BaseController {
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody BizClient record) {
|
||||
record.setCreateBy(getUsername());
|
||||
Long tenantId = getDeptId();
|
||||
if (tenantId == null) {
|
||||
tenantId = 1L;
|
||||
}
|
||||
record.setTenantId(tenantId);
|
||||
return toAjax(service.insertBizClient(record));
|
||||
}
|
||||
|
||||
|
||||
@@ -37,6 +37,9 @@ public class BizDeliveryOrderController extends BaseController {
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody BizDeliveryOrder record) {
|
||||
record.setCreateBy(getUsername());
|
||||
Long tenantId = getDeptId();
|
||||
if (tenantId == null) tenantId = 1L;
|
||||
record.setTenantId(tenantId);
|
||||
return toAjax(service.insertBizDeliveryOrder(record));
|
||||
}
|
||||
|
||||
@@ -54,4 +57,46 @@ public class BizDeliveryOrderController extends BaseController {
|
||||
public AjaxResult remove(@PathVariable Long[] doIds) {
|
||||
return toAjax(service.deleteBizDeliveryOrderByIds(doIds));
|
||||
}
|
||||
|
||||
// ════════════════════════════════════════
|
||||
// 状态流转
|
||||
// ════════════════════════════════════════════
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('bid:order:status')")
|
||||
@Log(title = "发货管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/{id}/ship")
|
||||
public AjaxResult ship(@PathVariable Long id) {
|
||||
return toAjax(service.ship(id));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('bid:order:status')")
|
||||
@Log(title = "发货管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/{id}/complete")
|
||||
public AjaxResult complete(@PathVariable Long id) {
|
||||
return toAjax(service.complete(id, getUsername()));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('bid:order:status')")
|
||||
@Log(title = "发货管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/{id}/recall")
|
||||
public AjaxResult recall(@PathVariable Long id) {
|
||||
return toAjax(service.recall(id));
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('bid:order:closeDate:edit')")
|
||||
@Log(title = "结单时间", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/{id}/closeDate")
|
||||
public AjaxResult setCloseDate(@PathVariable Long id, @RequestParam String closeDate) {
|
||||
return toAjax(service.setCloseDate(id, closeDate, getUsername()));
|
||||
}
|
||||
|
||||
// ════════════════════════════════════════
|
||||
// 物料发货记录
|
||||
// ════════════════════════════════════════════
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('bid:material:query')")
|
||||
@GetMapping("/materialRecords/{materialId}")
|
||||
public AjaxResult materialRecords(@PathVariable Long materialId) {
|
||||
return success(service.selectMaterialRecords(materialId));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user