生产工序业务修改

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/enumation/ProjectEnum.java

@@ -16,7 +16,9 @@ public class ProjectEnum {
     public enum TMaterialOut {
 
 
-        CONSUME_DATE(1, "ConsumeDate","材料消耗日期");
+        CONSUME_DATE(1, "ConsumeDate","材料消耗日期"),
+
+        PROCESSES_NAME(2, "processesName","工序名称");
 
 
         // 成员变量

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMaterialOutServiceImpl.java

@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,6 +40,7 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
 
     /**
      * 分页列表
+     *
      * @param pageQuery
      * @return
      */
@@ -53,6 +55,7 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
 
     /**
      * 领用出库
+     *
      * @param query
      * @return
      */
@@ -69,6 +72,7 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
 
     /**
      * 修改领用出库
+     *
      * @param query
      * @return
      */
@@ -86,6 +90,7 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
 
     /**
      * 领用出库详情
+     *
      * @param Uid
      * @return
      */
@@ -100,11 +105,12 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
 
     /**
      * 物资消耗列表查询 分页列表
+     *
      * @param tMaterialOutQuery
      * @return
      */
     @Override
-	public R<IPage<TMaterialOut>> getConsumePage(TMaterialOutQuery tMaterialOutQuery,PageQuery query) {
+    public R<IPage<TMaterialOut>> getConsumePage(TMaterialOutQuery tMaterialOutQuery, PageQuery query) {
         log.info(JSON.toJSONString(tMaterialOutQuery));
         //参数校验
         //分页
@@ -118,6 +124,9 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
                     .ge(ProjectEnum.TMaterialOut.CONSUME_DATE.getLabel(), DateUtil.getBeginTimeStr(tMaterialOutQuery.getConsumeDate()))
                     .le(ProjectEnum.TMaterialOut.CONSUME_DATE.getLabel(), DateUtil.getEndTimeStr(tMaterialOutQuery.getConsumeDate()));
         }
+        queryWrapper.eq(StringUtils.isNotBlank(tMaterialOutQuery.getProcessesName()),
+                ProjectEnum.TMaterialOut.PROCESSES_NAME.getLabel(),
+                tMaterialOutQuery.getConsumeType());
         //查询
         Page<TMaterialOut> tMaterialOutPage = baseMapper.selectPage(page, queryWrapper);
         return R.ok(tMaterialOutPage);