如果出库单的工序为辅助工序，品名为汽油或者柴油的时候，生成出库单的同时

     还需要在辅助工序里面生成对应的记录。但是再附中工序中只能修改产量和备注
     信息，其他信息不能修改，也不能删除。

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentAccountController.java

@@ -47,7 +47,14 @@ public class TEquipmentAccountController {
 	}
 
 
-
+	@ApiOperation(value = "选择设备")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "ProcessesName", value = "工序名称:爆破、辅助、运输、破碎、装车、穿孔", paramType = "query", dataType = "ProcessesName")
+	})
+	@GetMapping("/getList")
+	public R getList(String ProcessesName) {
+		return equipmentAccountService.getList(ProcessesName);
+	}
 
 
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesAuxiliary.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -46,58 +47,51 @@ public class TProcessesAuxiliary implements Serializable {
     private String EquipmentName;
 
     /**
-     * 项目经理
+     * 加油日期
      */
-    @TableField("Manager")
-    private String Manager;
+    @TableField("ConsumeDate")
+    private LocalDateTime ConsumeDate;
 
-    /**
-     * 主管项目领导
-     */
-    @TableField("Supervisor")
-    private String Supervisor;
 
-    /**
-     * 生产技术部
-     */
-    @TableField("TechDepart")
-    private String TechDepart;
+    @TableField("Name")
+    private String Name;
+
 
     /**
-     * 制表人
+     * 数量
      */
-    @TableField("Tabulator")
-    private String Tabulator;
+    @TableField("Amount")
+    private Float Amount;
 
     /**
-     * 当月累计油量
+     * 金额
      */
-    @TableField("Ljyl")
-    private Float Ljyl;
+    @TableField("Total")
+    private Float Total;
 
     /**
-     * 总价(元)
+     * 本次加油产量
      */
-    @TableField("Zj")
-    private Float Zj;
+    @TableField("Cl")
+    private Float Cl;
 
     /**
-     * 当月累计产量
+     * 单耗=当月累计油量/当月产量  (Amount/cl)
      */
-    @TableField("Dyljcl")
-    private Float Dyljcl;
+    @TableField("Dh")
+    private Float Dh;
 
     /**
-     * 单耗=当月累计油量/当月产量
+     * 材料领用人
      */
-    @TableField("Dh")
-    private Double Dh;
+    @TableField("Cllyr")
+    private String Cllyr;
 
     /**
-     * 备注
+     * 是否从出库单传过来的，若是，则计算成本的时候，不在把它包含在内
      */
-    @TableField("Bz")
-    private String Bz;
+    @TableField("Flag")
+    private Boolean Flag;
 
     /**
      * 日期标记,如:2021年01月
@@ -106,14 +100,11 @@ public class TProcessesAuxiliary implements Serializable {
     private String Tag;
 
     /**
-     * 司机
+     * 备注
      */
-    @TableField("Driver")
-    private String Driver;
+    @TableField("Bz")
+    private String Bz;
+
+
 
-    /**
-     * 作业日期
-      */
-    @TableField("Zyrq")
-    private String Zyrq;
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TMaterialOutQuery.java

@@ -39,7 +39,7 @@ public class TMaterialOutQuery {
     /**
      * 工序名称
      */
-    @ApiModelProperty("工序名称")
+    @ApiModelProperty("工序名称:爆破、辅助、运输、破碎、装车、穿孔")
     private String processesName;
 
     /**

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

@@ -28,7 +28,7 @@ public interface ITEquipmentAccountService extends IService<TEquipmentAccount> {
 
 	R<TEquipmentAccount> getDetail(String EquipmentID);
 
-	R<List<TEquipmentAccount>> getList();
+	R<List<TEquipmentAccount>> getList(String ProcessesName);
 
 	R<TEquipmentAccount> delete(String EquipmentID);
 

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

@@ -104,9 +104,13 @@ public class TEquipmentAccountServiceImpl extends ServiceImpl<TEquipmentAccountM
 	 * @return
 	 */
 	@Override
-	public R<List<TEquipmentAccount>> getList() {
-		List<TEquipmentAccount> list = this.list();
-		Rcode.NOT_FOUND.assertIsFalse(list!= null && list.size()>0);
+	public R<List<TEquipmentAccount>> getList(String ProcessesName) {
+		QueryWrapper<TEquipmentAccount> teaWrapper = new QueryWrapper<>();
+		if(StringUtils.isNotBlank(ProcessesName)){
+			teaWrapper.eq("ProcessesName", ProcessesName);
+		}
+		List<TEquipmentAccount> list = equipmentAccountMapper.selectList(teaWrapper);
+		Rcode.NOT_FOUND.assertIsFalse(list== null || list.size()<=0);
 		return R.ok(list);
 	}
 

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

@@ -4,11 +4,14 @@ import cn.wise.im.common.http.R;
 import cn.wise.im.common.http.ResponseEnum;
 import cn.wise.sc.acquisition.business.constant.Rcode;
 import cn.wise.sc.acquisition.business.entity.TMaterialOut;
+import cn.wise.sc.acquisition.business.entity.TProcessesAuxiliary;
 import cn.wise.sc.acquisition.business.enumation.ProjectEnum;
 import cn.wise.sc.acquisition.business.mapper.TMaterialOutMapper;
 import cn.wise.sc.acquisition.business.model.PageQuery;
 import cn.wise.sc.acquisition.business.model.query.TMaterialOutQuery;
+import cn.wise.sc.acquisition.business.model.query.TProcessesAuxiliaryQuery;
 import cn.wise.sc.acquisition.business.service.ITMaterialOutService;
+import cn.wise.sc.acquisition.business.service.ITProcessesAuxiliaryService;
 import cn.wise.sc.acquisition.business.service.ITSysDictService;
 import cn.wise.sc.acquisition.business.util.DateUtil;
 import com.alibaba.fastjson.JSON;
@@ -18,12 +21,15 @@ 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.apache.tomcat.util.descriptor.tagplugin.TagPluginParser;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -45,6 +51,10 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
 
     @Autowired
     private ITSysDictService itSysDictService;
+    @Autowired
+    private ITProcessesAuxiliaryService itProcessesAuxiliaryService;
+
+
 
     /**
      * 分页列表
@@ -84,6 +94,27 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
         }
         out.setTag(r.getData());
         materialOutMapper.insert(out);
+
+        //如果出库单的工序为辅助工序，品名为汽油或者柴油的时候，生成出库单的同时还需要在辅助工序里面生成对应的记录。
+        //但是再附中工序中只能修改产量和备注信息，其他信息不能修改，也不能删除
+        List<TProcessesAuxiliary> tpaList = new ArrayList<>();
+        if(out.getProcessesName().contains("辅助") && (out.getName().contains("柴油") || out.getName().contains("汽油"))){
+            TProcessesAuxiliary processesAuxiliary = new TProcessesAuxiliary();
+            processesAuxiliary.setEquipmentID(out.getEquipmentID());
+            processesAuxiliary.setEquipmentName(out.getEquipmentName());
+            processesAuxiliary.setConsumeDate(LocalDateTime.now());
+            processesAuxiliary.setName(out.getName());
+            processesAuxiliary.setAmount(out.getAmount());
+            processesAuxiliary.setTotal(out.getAmount() * out.getPrice());
+            processesAuxiliary.setCl(null);  //辅助工序的时候再存入 本次加油产量 和 单耗=Amount/cl
+            processesAuxiliary.setDh(null);
+            processesAuxiliary.setCllyr(out.getCllyr());
+            processesAuxiliary.setFlag(true);
+            processesAuxiliary.setTag(out.getTag());
+            processesAuxiliary.setBz(null);
+            tpaList.add(processesAuxiliary);
+        }
+        itProcessesAuxiliaryService.saveBatch(tpaList);
         return R.ok();
     }
 
@@ -105,6 +136,22 @@ public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMa
         Rcode.NOT_FOUND.assertNotNull(out);
         BeanUtils.copyProperties(query, out);
         materialOutMapper.updateById(out);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         return R.ok();
     }
 

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

@@ -95,8 +95,9 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
         QueryWrapper<TProcessesAuxiliary> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(ProjectEnum.TProcessesAuxiliary.UID.getLabel(), query.getUid());
         //计算单耗 防止失去精度，先转成字符串
-        float dh = temp.getLjyl() / temp.getDyljcl();
-        temp.setDh(Double.valueOf(String.valueOf(dh)));
+        float dh = temp.getAmount() / temp.getCl();
+
+        temp.setDh(Float.valueOf(String.valueOf(dh)));
         //修改
         int update = baseMapper.update(temp, queryWrapper);
         if (update > 0) {
@@ -143,11 +144,11 @@ public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxili
         tProcessesAuxiliary.setTag(r1.getData());
         //设置单耗
         if (query.getLjyl() == 0) {
-            tProcessesAuxiliary.setDh(0D);
+            tProcessesAuxiliary.setDh(0f);
         } else {
             //强转失去精度，借助字符串
             float dh = query.getLjyl() / query.getDyljcl();
-            tProcessesAuxiliary.setDh(Double.valueOf(String.valueOf(dh)));
+            tProcessesAuxiliary.setDh(Float.valueOf(String.valueOf(dh)));
         }
         //增加
         log.info(JSON.toJSONString(tProcessesAuxiliary));

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/DataStatisticsMapper.xml

@@ -9,18 +9,6 @@
         <if test="params.TruckID != null and params.TruckID != ''">
             and tw.TruckID =  #{params.TruckID}
         </if>
-        <if test="params.cycle == 1 ">
-            and datediff(week, tw.Rq,getdate())=0
-        </if>
-        <if test="params.cycle == 2 ">
-            and datediff(month, tw.Rq,getdate())=0
-        </if>
-        <if test="params.cycle = 3 ">
-            and datediff(quarter, tw.Rq,getdate())=0
-        </if>
-        <if test="params.cycle = 4 ">
-            and  datediff(year, tw.Rq,getdate())=0
-        </if>
         <if test="params.startDate != null and params.startDate != ''">
             and Convert(varchar(10),tw.Rq,120) <![CDATA[ >= ]]> #{params.startDate}
         </if>
@@ -42,18 +30,6 @@
         <if test="params.TruckID != null and params.TruckID != ''">
             and tw.TruckID =  #{params.TruckID}
         </if>
-        <if test="params.cycle == 1 ">
-            and datediff(week, tw.Rq,getdate())=0
-        </if>
-        <if test="params.cycle == 2 ">
-            and datediff(month, tw.Rq,getdate())=0
-        </if>
-        <if test="params.cycle = 3 ">
-            and datediff(quarter, tw.Rq,getdate())=0
-        </if>
-        <if test="params.cycle = 4 ">
-            and  datediff(year, tw.Rq,getdate())=0
-        </if>
         <if test="params.startDate != null and params.startDate != ''">
             and Convert(varchar(10),tw.Rq,120) <![CDATA[ >= ]]> #{params.startDate}
         </if>

acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TEquipmentCheckMapper.xml

@@ -2,21 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.wise.sc.acquisition.business.mapper.TEquipmentCheckMapper">
 
-    <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TEquipmentCheckVo">
-       select tea.EquipmentID,tea.EquipmentName,
-        tec.Uid,tec.Djbw,tec.Djnr,tec.Djbz,tec.Djzq,tec.Zqlx,tec.Djjg,tec.Ycjl,tec.Djr,tec.Djrq
-        from T_Equipment_Account tea
-        left join T_Equipment_Check tec on tec.EquipmentID = tea.EquipmentID
+    <select id="getPage" resultType="cn.wise.sc.acquisition.business.model.vo.TEquipmentCheckMainVo">
+       select tecm.*
+        from T_Equipment_Check_Main tecm
         <include refid="where"/>
-        order by tea.Ccrq desc
+        order by tecm.Djrq desc
     </select>
     <sql id="where">
         <where>
-            <if test="params.Djr != null and params.Djr != ''">
-                and tec.Djr = #{params.Djr}
+            <if test="params.selectMonth != null and params.selectMonth != ''">
+                and tecm.Tag = #{params.selectMonth}
             </if>
             <if test="params.EquipmentName != null and params.EquipmentName != ''">
-                and tea.EquipmentName like concat('%', #{params.EquipmentName}, '%')
+                and tecm.EquipmentName like concat('%', #{params.EquipmentName}, '%')
             </if>
         </where>
     </sql>