备品备件台账增加出入库记录

op-modules/op-device/src/main/java/com/op/device/domain/EquSparepartsInOut.java

@@ -2,6 +2,7 @@ package com.op.device.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -52,11 +53,29 @@ public class EquSparepartsInOut extends BaseEntity {
 
     private String nickName;
 
-
-
     ///////////////////////////
     private String storageId;
 
+
+    private String InAmount;
+    private String OutAmount;
+
+    public String getInAmount() {
+        return InAmount;
+    }
+
+    public void setInAmount(String inAmount) {
+        InAmount = inAmount;
+    }
+
+    public String getOutAmount() {
+        return OutAmount;
+    }
+
+    public void setOutAmount(String outAmount) {
+        OutAmount = outAmount;
+    }
+
     public String getNickName() {
         return nickName;
     }

op-modules/op-device/src/main/java/com/op/device/mapper/EquSparepartsInOutMapper.java

@@ -60,4 +60,6 @@ public interface EquSparepartsInOutMapper {
     public int deleteEquSparepartsInOutByIds(String[] ids);
 
     int selectSerialNumber();
+
+    EquSparepartsInOut selectEquSparepartsInOutListSum(EquSparepartsInOut equSparepartsInOut);
 }

op-modules/op-device/src/main/java/com/op/device/service/impl/EquSparepartsInOutImpl.java

@@ -209,4 +209,5 @@ public class EquSparepartsInOutImpl implements IEquSparepartsInOutService {
         equSparepartsInOutMapper.deleteEquSparepartsInOutById(id);
         return AjaxResult.success("删除成功，该备品备件库存已还原！");
     }
+
 }

op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsLedgerServiceImpl.java

@@ -9,6 +9,8 @@ import com.op.common.core.utils.StringUtils;
 import com.op.common.core.utils.uuid.IdUtils;
 import com.op.common.core.web.domain.AjaxResult;
 import com.op.common.security.utils.SecurityUtils;
+import com.op.device.domain.EquSparepartsInOut;
+import com.op.device.mapper.EquSparepartsInOutMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +37,8 @@ import static com.op.common.core.web.domain.AjaxResult.success;
 public class SparePartsLedgerServiceImpl implements ISparePartsLedgerService {
     @Autowired
     private SparePartsLedgerMapper sparePartsLedgerMapper;
+    @Autowired
+    private EquSparepartsInOutMapper equSparepartsInOutMapper;
 
     protected Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -59,7 +63,28 @@ public class SparePartsLedgerServiceImpl implements ISparePartsLedgerService {
     @Override
     @DS("#header.poolName")
     public List<SparePartsLedger> selectSparePartsLedgerList(SparePartsLedger sparePartsLedger) {
-        return sparePartsLedgerMapper.selectSparePartsLedgerList(sparePartsLedger);
+        List<SparePartsLedger> sparePartsLedgerList = sparePartsLedgerMapper.selectSparePartsLedgerList(sparePartsLedger);
+        for (int i = 0; i < sparePartsLedgerList.size(); i++) {
+            //查询出入库总数
+            EquSparepartsInOut sparepartsInOut =new EquSparepartsInOut();
+            sparepartsInOut.setSpareCode(sparePartsLedgerList.get(i).getMaterialCode());
+            sparepartsInOut=equSparepartsInOutMapper.selectEquSparepartsInOutListSum(sparepartsInOut);
+            // 设置入库记录（带非空判断）
+            if(sparepartsInOut != null && sparepartsInOut.getInAmount() != null) {
+                sparePartsLedgerList.get(i).setInputRecords(String.valueOf(sparepartsInOut.getInAmount()));
+            } else {
+                sparePartsLedgerList.get(i).setInputRecords("0"); // 默认值
+            }
+
+            // 设置出库记录（带非空判断）
+            if(sparepartsInOut != null && sparepartsInOut.getOutAmount() != null) {
+                sparePartsLedgerList.get(i).setOutputRecords(String.valueOf(sparepartsInOut.getOutAmount()));
+            } else {
+                sparePartsLedgerList.get(i).setOutputRecords("0"); // 默认值
+            }
+        }
+
+        return sparePartsLedgerList;
     }
 
     /**

op-modules/op-device/src/main/resources/mapper/device/EquSparepartsInOutMapper.xml

@@ -59,7 +59,9 @@
             <if test="attr1 != null  and attr1 != ''">and attr1 = #{attr1}</if>
             <if test="attr2 != null  and attr2 != ''">and attr2 = #{attr2}</if>
             <if test="attr3 != null  and attr3 != ''">and attr3 = #{attr3}</if>
-            <if test="createTime != null ">and esio.create_time = #{createTime}</if>
+            <if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''">
+                AND  esio.create_time between #{params.beginTime} and #{params.endTime}
+            </if>
             <if test="updateBy != null  and updateBy != ''">and esio.update_by = #{updateBy}</if>
             <if test="updateTime != null ">and esio.update_time = #{updateTime}</if>
             and esio.del_flag = '0'
@@ -155,4 +157,14 @@
 		FROM equ_spareparts_in_out
 		WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time)
 	</select>
+    <select id="selectEquSparepartsInOutListSum" resultType="com.op.device.domain.EquSparepartsInOut" parameterType="EquSparepartsInOut">
+         SELECT
+            CAST(SUM(CASE WHEN in_out_type = 'type_in' THEN amount ELSE 0 END) AS INT) AS InAmount,
+            CAST(SUM(CASE WHEN in_out_type = 'type_out' THEN amount ELSE 0 END) AS INT) AS OutAmount
+            FROM
+                equ_spareparts_in_out
+            WHERE
+            spare_code = #{spareCode}
+            AND del_flag = '0'
+    </select>
 </mapper>

op-modules/op-device/src/main/resources/mapper/device/SparePartsLedgerMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.op.device.mapper.SparePartsLedgerMapper">
-	
+
 	<resultMap type="SparePartsLedger" id="SparePartsLedgerResult">
 		<result property="storageId"	column="storage_id"	/>
 		<result property="storageType"	column="storage_type"	/>
@@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectSparePartsLedgerList" parameterType="SparePartsLedger" resultMap="SparePartsLedgerResult">
 		<include refid="selectSparePartsLedgerVo"/>
-		<where>  
+		<where>
 			<if test="storageId != null  and storageId != ''"> and storage_id = #{storageId}</if>
 			<if test="whCode != null  and whCode != ''"> and wh_code = #{whCode}</if>
 			<if test="regionCode != null  and regionCode != ''"> and region_code = #{regionCode}</if>
@@ -143,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			and del_flag = '0'
 		</where>
 	</select>
-	
+
 	<select id="selectSparePartsLedgerByStorageId" parameterType="String" resultMap="SparePartsLedgerResult">
 		<include refid="selectSparePartsLedgerVo"/>
 		where storage_id = #{storageId}
@@ -362,7 +362,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</update>
 
 	<update id="deleteSparePartsLedgerByStorageId" parameterType="String">
-		update equ_spareparts_ledger 
+		update equ_spareparts_ledger
 		set del_flag = '1'
 		where storage_id = #{storageId}
 	</update>
@@ -394,4 +394,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where material_code = #{materialCode}
 		and del_flag = '0'
 	</select>
-</mapper>
+</mapper>

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml

@@ -1781,7 +1781,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		FROM
 			mes_report_work  where workorder_code = #{workorderCode} and del_flag = '0'
 			                   and Reason is not null
-		                       and reason !=''
 		                       and reason !='无'
 		GROUP BY
 		    use_man_remark,