|
@@ -56,8 +56,8 @@ public class BizProductionPlanDetailSubDetailController extends BaseController {
|
|
|
@PreAuthorize("@ss.hasPermi('business:planDetailSubDetail:list')")
|
|
|
@GetMapping("/list")
|
|
|
public TableDataInfo list(BizProductionPlanDetailSubDetail bizProductionPlanDetailSubDetail) throws NoSuchFieldException, IllegalAccessException {
|
|
|
- String tenantId = request.getHeader("tenantId");
|
|
|
- bizProductionPlanDetailSubDetail.setTenantId(Long.valueOf(tenantId));
|
|
|
+// String tenantId = request.getHeader("tenantId");
|
|
|
+// bizProductionPlanDetailSubDetail.setTenantId(Long.valueOf(tenantId));
|
|
|
startPage();
|
|
|
List<BizProductionPlanDetailSubDetail> list = bizProductionPlanDetailSubDetailService.getList(bizProductionPlanDetailSubDetail);
|
|
|
return getDataTable(list);
|
|
@@ -72,9 +72,9 @@ public class BizProductionPlanDetailSubDetailController extends BaseController {
|
|
|
@GetMapping("/getDept")
|
|
|
public AjaxResult getDept() throws NoSuchFieldException, IllegalAccessException {
|
|
|
Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
|
|
|
- String tenantId = request.getHeader("tenantId");
|
|
|
+// String tenantId = request.getHeader("tenantId");
|
|
|
// Long userId = 265L;
|
|
|
- List<SysDeptUser> deptUserList = deptUserService.query().eq("user_id", userId).eq("tenant_id",Long.valueOf(tenantId)).list();
|
|
|
+ List<SysDeptUser> deptUserList = deptUserService.query().eq("user_id", userId).list();
|
|
|
List<Long> ids = new ArrayList<>();
|
|
|
for (SysDeptUser item : deptUserList
|
|
|
) {
|
|
@@ -123,8 +123,8 @@ public class BizProductionPlanDetailSubDetailController extends BaseController {
|
|
|
@Log(title = "生产子计划明细", businessType = BusinessType.INSERT)
|
|
|
@PostMapping("/save")
|
|
|
public AjaxResult add(@RequestBody BizProductionPlanDetailSubDetail bizProductionPlanDetailSubDetail) throws NoSuchFieldException, IllegalAccessException {
|
|
|
- String tenantId = request.getHeader("tenantId");
|
|
|
- bizProductionPlanDetailSubDetail.setTenantId(Long.valueOf(tenantId));
|
|
|
+// String tenantId = request.getHeader("tenantId");
|
|
|
+// bizProductionPlanDetailSubDetail.setTenantId(Long.valueOf(tenantId));
|
|
|
|
|
|
/*
|
|
|
* 德迈仕生产批号生成规则
|
|
@@ -194,7 +194,7 @@ public class BizProductionPlanDetailSubDetailController extends BaseController {
|
|
|
bizLot.setProductId(bizProductionPlanDetailSubDetail.getProductId());
|
|
|
bizLot.setProductDescription(bizProductionPlanDetailSubDetail.getProductDescription());
|
|
|
bizLot.setProductionQuantity(oneLotQuantity);
|
|
|
- bizLot.setTenantId(bizProductionPlanDetailSubDetail.getTenantId());
|
|
|
+// bizLot.setTenantId(bizProductionPlanDetailSubDetail.getTenantId());
|
|
|
if (i == lotNumber - 1) {
|
|
|
bizLot.setProductionQuantity(lastLotQuantity);
|
|
|
}
|
|
@@ -214,8 +214,8 @@ public class BizProductionPlanDetailSubDetailController extends BaseController {
|
|
|
@Log(title = "生产子计划明细", businessType = BusinessType.UPDATE)
|
|
|
@PutMapping("/save")
|
|
|
public AjaxResult edit(@RequestBody BizProductionPlanDetailSubDetail bizProductionPlanDetailSubDetail) throws NoSuchFieldException, IllegalAccessException {
|
|
|
- String tenantId = request.getHeader("tenantId");
|
|
|
- bizProductionPlanDetailSubDetail.setTenantId(Long.valueOf(tenantId));
|
|
|
+// String tenantId = request.getHeader("tenantId");
|
|
|
+// bizProductionPlanDetailSubDetail.setTenantId(Long.valueOf(tenantId));
|
|
|
return toAjax(bizProductionPlanDetailSubDetailService.updateById(bizProductionPlanDetailSubDetail));
|
|
|
}
|
|
|
|