生产任务添加检索

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

@@ -2,6 +2,7 @@ package com.fjhx.mes.controller.production;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.mes.entity.production.dto.ProduceOrderDetailSelectDto;
+import com.fjhx.mes.entity.production.dto.ProductionOrderDetailDto;
 import com.fjhx.mes.entity.production.dto.ProductionTaskDetailDto;
 import com.fjhx.mes.entity.production.vo.ProductionOrderDetailVo;
 import com.fjhx.mes.service.production.ProduceOrderDetailService;
@@ -53,4 +54,12 @@ public class ProduceOrderDetailController {
         return produceOrderDetailService.detailByIds(dto.getTaskIds());
     }
 
+    /**
+     * 修改备注
+     */
+    @PostMapping("/editRemark")
+    public void editRemark(@RequestBody ProductionOrderDetailDto dto) {
+        produceOrderDetailService.editRemark(dto);
+    }
+
 }

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

@@ -68,4 +68,9 @@ public class ProductionOrderDetail extends BasePo {
      */
     private Long companyId;
 
+    /**
+     * 任务备注
+     */
+    private String remark;
+
 }

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

@@ -2,6 +2,7 @@ package com.fjhx.mes.service.production;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.mes.entity.production.dto.ProduceOrderDetailSelectDto;
+import com.fjhx.mes.entity.production.dto.ProductionOrderDetailDto;
 import com.fjhx.mes.entity.production.dto.ProductionTaskDetailDto;
 import com.fjhx.mes.entity.production.po.ProductionOrderDetail;
 import com.fjhx.mes.entity.production.vo.ProductionOrderDetailVo;
@@ -34,4 +35,9 @@ public interface ProduceOrderDetailService extends BaseService<ProductionOrderDe
      * 批量任务详情
      */
     List<ProductionOrderDetailVo> detailByIds(List<Long> taskIds);
+
+    /**
+     * 修改备注
+     */
+    void editRemark(ProductionOrderDetailDto dto);
 }

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

@@ -8,6 +8,7 @@ import com.fjhx.common.utils.Assert;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.mes.entity.production.dto.ProduceOrderDetailSelectDto;
+import com.fjhx.mes.entity.production.dto.ProductionOrderDetailDto;
 import com.fjhx.mes.entity.production.dto.ProductionTaskDetailDto;
 import com.fjhx.mes.entity.production.po.ProductionOrder;
 import com.fjhx.mes.entity.production.po.ProductionOrderDetail;
@@ -23,6 +24,7 @@ import com.fjhx.sale.entity.contract.vo.ContractProductBomVo;
 import com.fjhx.sale.service.contract.ContractProductBomService;
 import com.fjhx.sale.service.contract.ContractProductService;
 import com.fjhx.tenant.utils.DeptUstil;
+import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
@@ -72,7 +74,13 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
         wrapper.ge("po", ProductionOrder::getCreateTime, dto.getBeginTime());
         wrapper.le("po", ProductionOrder::getCreateTime, dto.getEndTime());
         //关键字
-        wrapper.keyword(dto.getKeyword(), new SqlField("po", ProductionOrder::getCode));
+        if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
+            wrapper.and(q -> q
+                    .like("po.code", dto.getKeyword())
+                    .or().apply("po.contract_id in (SELECT DISTINCT c.id FROM contract c JOIN customer cu ON c.buy_corporation_id = cu.id JOIN sys_user su ON cu.user_id = su.user_id WHERE su.nick_name LIKE CONCAT('%', {0},'%'))", dto.getKeyword())
+            );
+            wrapper.keyword(dto.getKeyword(), new SqlField("po", ProductionOrder::getCode));
+        }
 
         wrapper.orderByDesc("po", ProductionOrder::getCreateTime);
         wrapper.orderByDesc("pod", ProductionOrderDetail::getId);
@@ -255,4 +263,16 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
         return voList;
     }
 
+    @Override
+    public void editRemark(ProductionOrderDetailDto dto) {
+        Assert.notEmpty(dto.getId(), "生产任务id不能为空！");
+
+        this.update(q -> q
+                .eq(ProductionOrderDetail::getId, dto.getId())
+                .set(ProductionOrderDetail::getRemark, dto.getRemark())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
+
 }