添加其他生产任务备注

hx-mes/src/main/java/com/fjhx/mes/controller/production/ProduceOrderDetailController.java

@@ -70,6 +70,14 @@ public class ProduceOrderDetailController {
         produceOrderDetailService.editRemark(dto);
     }
 
+    /**
+     * 修改其他生产备注
+     */
+    @PostMapping("/editOtherProdRemark")
+    public void editOtherProdRemark(@RequestBody ProductionOrderDetailDto dto) {
+        produceOrderDetailService.editOtherProdRemark(dto);
+    }
+
     @PostMapping("/taskCount")
     public JSONObject taskCount(@RequestBody ProduceOrderDetailSelectDto dto) {
         return produceOrderDetailService.taskCount(dto);

hx-mes/src/main/java/com/fjhx/mes/entity/production/po/ProductionOrderDetail.java

@@ -114,4 +114,9 @@ public class ProductionOrderDetail extends BasePo {
      */
     private Integer beginWorkStatus;
 
+    /**
+     * 其他生产说明
+     */
+    private String otherProdRemark;
+
 }

hx-mes/src/main/java/com/fjhx/mes/service/production/ProduceOrderDetailService.java

@@ -47,6 +47,11 @@ public interface ProduceOrderDetailService extends BaseService<ProductionOrderDe
     void editRemark(ProductionOrderDetailDto dto);
 
     /**
+     * 修改其他生产说明
+     */
+    void editOtherProdRemark(ProductionOrderDetailDto dto);
+
+    /**
      * 任务统计
      */
     JSONObject taskCount(ProduceOrderDetailSelectDto dto);

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderDetailServiceImpl.java

@@ -423,6 +423,18 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
     }
 
     @Override
+    public void editOtherProdRemark(ProductionOrderDetailDto dto) {
+        Assert.notEmpty(dto.getId(), "生产任务id不能为空！");
+
+        this.update(q -> q
+                .eq(ProductionOrderDetail::getId, dto.getId())
+                .set(ProductionOrderDetail::getOtherProdRemark, dto.getOtherProdRemark())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
+
+    @Override
     public JSONObject taskCount(ProduceOrderDetailSelectDto dto) {
         dto.setIsHand(null);
 

hx-mes/src/main/resources/mapper/production/ProduceOrderDetailMapper.xml

@@ -27,6 +27,7 @@
                pod.is_cabinet_confirm,
                pod.work_remark,
                pod.begin_work_status,
+               pod.other_prod_remark,
                po.code                                                        AS orderCode,
                po.create_time                                                 AS orderCreateTime,
                po.produce_time,