任务报工锁定

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

@@ -76,4 +76,12 @@ public class ProduceOrderDetailController {
         return produceOrderDetailService.taskCount(dto);
     }
 
+    /**
+     * 报工锁定或解锁
+     */
+    @PostMapping("/reportLockOrUnlock")
+    public void reportLockOrUnlock(@RequestBody ProduceOrderDetailSelectDto dto) {
+        produceOrderDetailService.reportLockOrUnlock(dto);
+    }
+
 }

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

@@ -73,4 +73,9 @@ public class ProductionOrderDetail extends BasePo {
      */
     private String remark;
 
+    /**
+     * 报工锁定
+     */
+    private Integer reportLock;
+
 }

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

@@ -51,4 +51,9 @@ public interface ProduceOrderDetailService extends BaseService<ProductionOrderDe
      * 任务统计
      */
     JSONObject taskCount(ProduceOrderDetailSelectDto dto);
+
+    /**
+     * 报工锁定或解锁
+     */
+    void reportLockOrUnlock(ProduceOrderDetailSelectDto dto);
 }

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

@@ -388,4 +388,17 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
         return json;
     }
 
+    /**
+     * 报工锁定或解锁
+     */
+    @Override
+    public void reportLockOrUnlock(ProduceOrderDetailSelectDto dto) {
+        this.update(q -> q
+                .eq(ProductionOrderDetail::getId, dto.getId())
+                .setSql("report_lock = if(report_lock=1,0,1)")
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
+
 }

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

@@ -18,6 +18,7 @@
                pod.update_user,
                pod.update_time,
                pod.del_flag,
+               pod.report_lock,
                po.code                                                        AS orderCode,
                po.create_time                                                 AS orderCreateTime,
                po.produce_time,