|
@@ -1,6 +1,7 @@
|
|
|
package com.steerinfo.meterwork.meterworkcaractualfirst.service.impl;
|
|
package com.steerinfo.meterwork.meterworkcaractualfirst.service.impl;
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
|
+import com.jisco.dynamicweight.dynamicbasecamera.factories.ConverterFactories;
|
|
|
import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
|
|
import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
|
|
|
import com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo;
|
|
import com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo;
|
|
|
import com.steerinfo.baseinfo.meterbaseaddweight.mapper.MeterBaseAddWeightMapper;
|
|
import com.steerinfo.baseinfo.meterbaseaddweight.mapper.MeterBaseAddWeightMapper;
|
|
@@ -109,6 +110,8 @@ import java.util.stream.Collectors;
|
|
|
@Service(value = "meterWorkCarActualFirstService")
|
|
@Service(value = "meterWorkCarActualFirstService")
|
|
|
public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWorkCarActualFirst, String> implements IMeterWorkCarActualFirstService {
|
|
public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWorkCarActualFirst, String> implements IMeterWorkCarActualFirstService {
|
|
|
|
|
|
|
|
|
|
+ private static Logger logger = LoggerFactory.getLogger( MeterWorkCarActualFirstServiceImpl.class );
|
|
|
|
|
+
|
|
|
@Resource
|
|
@Resource
|
|
|
private MeterBaseMatterUnitMixedLoadUnloadTimeMapper meterBaseMatterUnitMixedLoadUnloadTimeMapper;
|
|
private MeterBaseMatterUnitMixedLoadUnloadTimeMapper meterBaseMatterUnitMixedLoadUnloadTimeMapper;
|
|
|
|
|
|
|
@@ -1518,13 +1521,18 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
netDb.setCreateTime(netDb.getTareTime());
|
|
netDb.setCreateTime(netDb.getTareTime());
|
|
|
netDb.setCreateManName(netDb.getTareManName());
|
|
netDb.setCreateManName(netDb.getTareManName());
|
|
|
}
|
|
}
|
|
|
- //新增补丁,给净重数据重新赋值一次数据的计量方式2023年10月18日zn
|
|
|
|
|
- //查询毛重数据
|
|
|
|
|
- MeterWorkCarActualFirst first1 = meterWorkCarActualFirstMapper.selectByPrimaryKey(netDb.getActualFirst1No());
|
|
|
|
|
- //查询皮重数据
|
|
|
|
|
- MeterWorkCarActualFirst first2 = meterWorkCarActualFirstMapper.selectByPrimaryKey(netDb.getActualFirst2No());
|
|
|
|
|
- netDb.setGrossMode(first1.getMeterMode());
|
|
|
|
|
- netDb.setTareMode(first2.getMeterMode());
|
|
|
|
|
|
|
+ try {
|
|
|
|
|
+ //新增补丁,给净重数据重新赋值一次数据的计量方式2023年10月18日zn
|
|
|
|
|
+ //查询毛重数据
|
|
|
|
|
+ MeterWorkCarActualFirst first1 = meterWorkCarActualFirstMapper.selectByPrimaryKey(netDb.getActualFirst1No());
|
|
|
|
|
+ //查询皮重数据
|
|
|
|
|
+ MeterWorkCarActualFirst first2 = meterWorkCarActualFirstMapper.selectByPrimaryKey(netDb.getActualFirst2No());
|
|
|
|
|
+ netDb.setGrossMode(first1.getMeterMode());
|
|
|
|
|
+ netDb.setTareMode(first2.getMeterMode());
|
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
|
+ logger.error("修改计量方式出错", e);
|
|
|
|
|
+ e.printStackTrace();
|
|
|
|
|
+ }
|
|
|
meterWorkCarActualMapper.insert(netDb);
|
|
meterWorkCarActualMapper.insert(netDb);
|
|
|
|
|
|
|
|
//4、如果为期限皮重,则将期限皮重转化为一条皮重计量数据保存
|
|
//4、如果为期限皮重,则将期限皮重转化为一条皮重计量数据保存
|
|
@@ -5661,12 +5669,17 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
model.setCreateManName(model.getTareManName());
|
|
model.setCreateManName(model.getTareManName());
|
|
|
}
|
|
}
|
|
|
//新增补丁,给净重数据重新赋值一次数据的计量方式2023年10月18日zn
|
|
//新增补丁,给净重数据重新赋值一次数据的计量方式2023年10月18日zn
|
|
|
- //查询毛重数据
|
|
|
|
|
- MeterWorkCarActualFirst actualFirst1 = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst1No());
|
|
|
|
|
- //查询皮重数据
|
|
|
|
|
- MeterWorkCarActualFirst actualFirst2 = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
|
|
|
|
|
- model.setGrossMode(actualFirst1.getMeterMode());
|
|
|
|
|
- model.setTareMode(actualFirst2.getMeterMode());
|
|
|
|
|
|
|
+ try {
|
|
|
|
|
+ //查询毛重数据
|
|
|
|
|
+ MeterWorkCarActualFirst actualFirst1 = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst1No());
|
|
|
|
|
+ //查询皮重数据
|
|
|
|
|
+ MeterWorkCarActualFirst actualFirst2 = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
|
|
|
|
|
+ model.setGrossMode(actualFirst1.getMeterMode());
|
|
|
|
|
+ model.setTareMode(actualFirst2.getMeterMode());
|
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
|
+ logger.error("修改计量方式出错", e);
|
|
|
|
|
+ e.printStackTrace();
|
|
|
|
|
+ }
|
|
|
meterWorkCarActualMapper.insertSelective(model);
|
|
meterWorkCarActualMapper.insertSelective(model);
|
|
|
|
|
|
|
|
//更新委托信息状态
|
|
//更新委托信息状态
|