guoyujia 1 рік тому
батько
коміт
e4b3c8383a

+ 1 - 0
src/main/java/cn/ezhizao/project/business/controller/BizProductionPlanDetailSubDetailController.java

@@ -192,6 +192,7 @@ public class BizProductionPlanDetailSubDetailController extends BaseController {
             bizLot.setProductId(bizProductionPlanDetailSubDetail.getProductId());
             bizLot.setProductDescription(bizProductionPlanDetailSubDetail.getProductDescription());
             bizLot.setProductionQuantity(oneLotQuantity);
+            bizLot.setTenantId(bizProductionPlanDetailSubDetail.getTenantId());
             if (i == lotNumber - 1) {
                 bizLot.setProductionQuantity(lastLotQuantity);
             }

+ 4 - 3
src/main/java/cn/ezhizao/project/business/controller/BizProductionPlanDetailSubDetailEquipmentController.java

@@ -98,9 +98,10 @@ public class BizProductionPlanDetailSubDetailEquipmentController extends BaseCon
     @Log(title = "生产计划明细", businessType = BusinessType.INSERT)
     @PostMapping("/saveBatch")
     public AjaxResult saveBatch(@RequestBody List<BizProductionPlanDetailSubDetailEquipment> bizProductionPlanDetailSubDetailEquipment) throws NoSuchFieldException, IllegalAccessException {
-        setTenantId(bizProductionPlanDetailSubDetailEquipment);
-
-
+        final String tenantId = request.getHeader("tenantId");
+        for (BizProductionPlanDetailSubDetailEquipment item : bizProductionPlanDetailSubDetailEquipment) {
+            item.setTenantId(Long.valueOf(tenantId));
+        }
         return toAjax(bizProductionPlanDetailSubDetailEquipmentService.saveBatch(bizProductionPlanDetailSubDetailEquipment));
     }
     /**

+ 6 - 0
src/main/java/cn/ezhizao/project/business/domain/BizEquipmentDetail.java

@@ -26,6 +26,12 @@ public class BizEquipmentDetail extends BaseEntity
     @ApiModelProperty(value = "${comment}")
     private Long equipmentId;
 
+    /**
+     * 租户(厂别)id
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long tenantId;
+
     /** 设备名称 */
     @Excel(name = "设备名称")
     @ApiModelProperty(value = "设备名称")

+ 5 - 0
src/main/java/cn/ezhizao/project/business/domain/BizLot.java

@@ -22,6 +22,11 @@ public class BizLot extends BaseEntity {
     @ApiModelProperty(value = "批次号")
     private String lotCode;
 
+    /**
+     * 租户(厂别)id
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long tenantId;
     /**
      * 计划单id
      */