1

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/DepartmentController.java

@@ -156,10 +156,12 @@ public class DepartmentController {
     @RequestMapping("/getIncharger")
     public HttpRespMsg getIncharger(Integer deptId){
         HttpRespMsg httpRespMsg=new HttpRespMsg();
-        Department department = departmentService.getById(deptId);
-        if(department.getManagerId()!=null){
-            User user = userMapper.selectById(department.getManagerId());
-            httpRespMsg.setData(user);
+        if(deptId!=null){
+            Department department = departmentService.getById(deptId);
+            if(department.getManagerId()!=null){
+                User user = userMapper.selectById(department.getManagerId());
+                httpRespMsg.setData(user);
+            }
         }
         return httpRespMsg;
     }

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/entity/PlanMaterial.java

@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2023-07-25
+ * @since 2023-07-26
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -35,18 +35,6 @@ public class PlanMaterial extends Model<PlanMaterial> {
     @TableField("is_checked")
     private Boolean isChecked;
 
-    /**
-     * 数量（个/产品）：产品数量*产品物料单中数量
-     */
-    @TableField("number_product")
-    private Integer numberProduct;
-
-    /**
-     * 数量（个/辆）：产品数量*产品物料单中数量
-     */
-    @TableField("number_vehicle")
-    private Integer numberVehicle;
-
     /**
      * 缺少数量
      */

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/PlanServiceImpl.java

@@ -119,9 +119,9 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
             plan.setStationName(department.getDepartmentName());
         }
         if(plan.getProductId()!=null){
-            Product product = productMapper.selectById(plan.getProductId());
-            plan.setProductName(product.getName());
-        }
+                Product product = productMapper.selectById(plan.getProductId());
+                plan.setProductName(product.getName());
+            }
         if(plan.getId()==null){
             if(count(new QueryWrapper<Plan>().eq("product_scheduling_num",plan.getProductSchedulingNum()))>0){
                 msg.setError("当前排产工单号已存在");

fhKeeper/formulahousekeeper/management-workshop/src/main/resources/mapper/PlanMaterialMapper.xml

@@ -7,14 +7,12 @@
         <id column="plan_id" property="planId" />
         <result column="prod_material_id" property="prodMaterialId" />
         <result column="is_checked" property="isChecked" />
-        <result column="number_product" property="numberProduct" />
-        <result column="number_vehicle" property="numberVehicle" />
         <result column="lack_number" property="lackNumber" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        plan_id, prod_material_id, is_checked, number_product, number_vehicle, lack_number
+        plan_id, prod_material_id, is_checked, lack_number
     </sql>
 
 </mapper>

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/planComponent.vue

@@ -224,7 +224,7 @@
               type="textarea"
               :rows="6"
               placeholder="请输入描述"
-              v-model="textarea"
+              v-model="todayPlanForm.describtion"
             >
             </el-input>
           </el-form-item>
@@ -252,13 +252,19 @@
     >
       <div>
         <span>{{ "选择部门" }}</span>
-        <el-cascader
+        <!-- <el-cascader
           v-model="departmentIdArray"
           :options="departmentList"
           :props="props"
           collapse-tags
           clearable
         >
+        </el-cascader> -->
+        <el-cascader
+          v-model="departmentIdArray"
+          :options="departmentList"
+          :props="{ multiple: true, checkStrictly: true }"
+          clearable>
         </el-cascader>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -635,8 +641,8 @@ export default {
         },
         (res) => {
           if (res.code == "ok") {
-            this.todayPlanForm.foremanId = res.data.id;
-            this.todayPlanForm.foremanName = res.data.name;
+            this.todayPlanForm.foremanId = res.data ? res.data.id : '';
+            this.todayPlanForm.foremanName = res.data ? res.data.name : ''
           } else {
             this.$message({
               message: res.msg,

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/planComponentDetil.vue

@@ -154,7 +154,7 @@ export default {
         height: 100%;
         display: flex;
         flex-wrap: wrap;
-        flex-direction: column;
+        flex-direction: inherit;
         box-sizing: border-box;
         // padding: 20px;
         .planComponentDetil-top, .planComponentDetil-con, .planComponentDetil-bon {