修改

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/mapper/DynamicWorkUpdataMapper.java

@@ -29,7 +29,7 @@ public interface DynamicWorkUpdataMapper extends IBaseMapper<DynamicWorkUpdata,
      * @param endTime
      * @return
      */
-    BigDecimal inbatchsTotalWeight(String stationCode, String materialCode, Date startTime, Date endTime);
+    BigDecimal inbatchsTotalWeight(String stationCode, String materialName, Date startTime, Date endTime);
 
     /**
      * 返粉总重量
@@ -92,12 +92,12 @@ public interface DynamicWorkUpdataMapper extends IBaseMapper<DynamicWorkUpdata,
     /**
      * 批量作废数据
      * @param stationCode
-     * @param materialCode
+     * @param materialName
      * @param startTime
      * @param endTime
      * @return
      */
-    int batchDisable(String stationCode, String materialCode, Date startTime, Date endTime, String updateManNo, String updateManName, Date updateTime);
+    int batchDisable(String stationCode, String materialName, Date startTime, Date endTime, String updateManNo, String updateManName, Date updateTime);
 
     /**
      * 作废返粉的原始数据

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/mapper/DynamicWorkUpdataMapper.xml

@@ -1382,7 +1382,7 @@
             update_man_name = #{updateManName},
             update_time     = #{updateTime}
         where STATION_CODE = #{stationCode}
-          and MATERIAL_CODE = #{materialCode}
+          and MATERIAL_NAME = #{materialName}
           and END_TIME between #{startTime} and #{endTime}
     </update>
     <select id="recalc" statementType="CALLABLE">
@@ -1393,7 +1393,7 @@
         select sum(weight)
         from DYNAMIC_WORK_UPDATA
         where STATION_CODE = #{stationCode}
-          and MATERIAL_CODE = #{materialCode}
+          and MATERIAL_NAME = #{materialName}
           and END_TIME between #{startTime} and #{endTime}
           and VALID_FLAG = '1'
           and AUDITING_FLAG = '0'

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/service/impl/DynamicWorkUpdataServiceImpl.java

@@ -89,10 +89,10 @@ public class DynamicWorkUpdataServiceImpl extends BaseServiceImpl<DynamicWorkUpd
         DynamicWorkUpdata byId = this.getById(updataNo);
         Assert.notNull(byId, "记录不存在");
         Assert.notNull(byId.getStationCode(), "记录站点编码为空，无法计算分批总重量");
-        Assert.notNull(byId.getMaterialCode(), "记录物料编码为空，无法计算分批总重量");
+//        Assert.notNull(byId.getMaterialCode(), "记录物料编码为空，无法计算分批总重量");
 //        Assert.notNull(byId.getEndTime(), "记录结束时间为空，无法计算分批总重量");
 //        Assert.notNull(byId.getStationCode(), "记录所属站点为空，无法计算分批总重量");
-        BigDecimal weight = dynamicWorkUpdataMapper.inbatchsTotalWeight(byId.getStationCode(), byId.getMaterialCode(), startTime, endTime);
+        BigDecimal weight = dynamicWorkUpdataMapper.inbatchsTotalWeight(byId.getStationCode(), byId.getMaterialName(), startTime, endTime);
         return weight;
     }
 
@@ -257,7 +257,7 @@ public class DynamicWorkUpdataServiceImpl extends BaseServiceImpl<DynamicWorkUpd
         int batchAdd = this.batchAdd(updataList);
         Assert.isTrue(list.size() == batchAdd, "保存分批数据失败");
         // 作废原数据
-        dynamicWorkUpdataMapper.batchDisable(updata.getStationCode(), updata.getMaterialCode(), startTime, endTime, UserUtil.getCurrentUserId(), UserUtil.getCurrentUserName(), new Date());
+        dynamicWorkUpdataMapper.batchDisable(updata.getStationCode(), updata.getMaterialName(), startTime, endTime, UserUtil.getCurrentUserId(), UserUtil.getCurrentUserName(), new Date());
     }
 
     /**