|
@@ -207,6 +207,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
if(StringUtils.isNotEmpty(model.getPredictionNo())){
|
|
if(StringUtils.isNotEmpty(model.getPredictionNo())){
|
|
|
model.setIsPreScale("1");
|
|
model.setIsPreScale("1");
|
|
|
}
|
|
}
|
|
|
|
|
+ model.setCreateTime(new Date());
|
|
|
int num = meterWorkCarActualFirstMapper.insertSelective(model);
|
|
int num = meterWorkCarActualFirstMapper.insertSelective(model);
|
|
|
rm.setData(model.getActualFirstNo());
|
|
rm.setData(model.getActualFirstNo());
|
|
|
rm.setMessage(enStr);
|
|
rm.setMessage(enStr);
|
|
@@ -1067,6 +1068,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
if(oci.getWeightType().equals("1")){
|
|
if(oci.getWeightType().equals("1")){
|
|
|
|
|
|
|
|
}*/
|
|
}*/
|
|
|
|
|
+ oci.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insert(oci);
|
|
meterWorkCarActualFirstMapper.insert(oci);
|
|
|
|
|
|
|
|
//2、存储历史皮重及历史皮重明细信息
|
|
//2、存储历史皮重及历史皮重明细信息
|
|
@@ -1128,6 +1130,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
secondDb.setActualFirstNo(no);
|
|
secondDb.setActualFirstNo(no);
|
|
|
|
|
|
|
|
secondDb.setValueFlag("2");//洁净
|
|
secondDb.setValueFlag("2");//洁净
|
|
|
|
|
+ secondDb.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(secondDb);
|
|
meterWorkCarActualFirstMapper.insertSelective(secondDb);
|
|
|
|
|
|
|
|
//修改一次计量数据为洁净
|
|
//修改一次计量数据为洁净
|
|
@@ -1198,6 +1201,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
netDb.setNetWeight(net);
|
|
netDb.setNetWeight(net);
|
|
|
}
|
|
}
|
|
|
netDb.setUploadFlag("1");
|
|
netDb.setUploadFlag("1");
|
|
|
|
|
+ netDb.setCreateTime(new Date());
|
|
|
meterWorkCarActualMapper.insert(netDb);
|
|
meterWorkCarActualMapper.insert(netDb);
|
|
|
|
|
|
|
|
//4、如果为期限皮重,则将期限皮重转化为一条皮重计量数据保存
|
|
//4、如果为期限皮重,则将期限皮重转化为一条皮重计量数据保存
|
|
@@ -1222,7 +1226,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
// imTare.setActualFirstNo(afl1 + imTareNO);
|
|
// imTare.setActualFirstNo(afl1 + imTareNO);
|
|
|
|
|
|
|
|
String imTareNO = PublicMethod.IdCreate(3);
|
|
String imTareNO = PublicMethod.IdCreate(3);
|
|
|
- imTare.setActualFirstNo(no);
|
|
|
|
|
|
|
+ imTare.setActualFirstNo(imTareNO);
|
|
|
|
|
|
|
|
imTare.setMeterTypeNo(secondDb.getMeterTypeNo());
|
|
imTare.setMeterTypeNo(secondDb.getMeterTypeNo());
|
|
|
imTare.setMeterTypeName(secondDb.getMeterTypeName());
|
|
imTare.setMeterTypeName(secondDb.getMeterTypeName());
|
|
@@ -1354,6 +1358,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
secondDb.setUpdateManNo("system");
|
|
secondDb.setUpdateManNo("system");
|
|
|
secondDb.setUpdateManName("混装洁净更新");
|
|
secondDb.setUpdateManName("混装洁净更新");
|
|
|
secondDb.setPredictionType("7");
|
|
secondDb.setPredictionType("7");
|
|
|
|
|
+ secondDb.setCreateTime(new Date());
|
|
|
secondDb.setPredictionCombination(upModel.getPredictionNo() + "," + netDb.getPredictionNo());
|
|
secondDb.setPredictionCombination(upModel.getPredictionNo() + "," + netDb.getPredictionNo());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(secondDb);
|
|
meterWorkCarActualFirstMapper.insertSelective(secondDb);
|
|
|
|
|
|
|
@@ -1369,6 +1374,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
once.setUpdateManNo("system");
|
|
once.setUpdateManNo("system");
|
|
|
once.setUpdateManName("混装洁净更新");
|
|
once.setUpdateManName("混装洁净更新");
|
|
|
once.setPredictionType("7");
|
|
once.setPredictionType("7");
|
|
|
|
|
+ once.setCreateTime(new Date());
|
|
|
once.setPredictionCombination(upModel.getPredictionNo() + "," + netDb.getPredictionNo());
|
|
once.setPredictionCombination(upModel.getPredictionNo() + "," + netDb.getPredictionNo());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(once);
|
|
meterWorkCarActualFirstMapper.insertSelective(once);
|
|
|
|
|
|
|
@@ -1390,6 +1396,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
netDb.setUploadFlag("1");
|
|
netDb.setUploadFlag("1");
|
|
|
// 拿到洁净编号B
|
|
// 拿到洁净编号B
|
|
|
netDb.setPredictionCombination(upModel.getPredictionNo() + "," + netDb.getPredictionNo());
|
|
netDb.setPredictionCombination(upModel.getPredictionNo() + "," + netDb.getPredictionNo());
|
|
|
|
|
+ netDb.setCreateTime(new Date());
|
|
|
meterWorkCarActualMapper.insert(netDb);
|
|
meterWorkCarActualMapper.insert(netDb);
|
|
|
|
|
|
|
|
//1b.如果receive_remark是H01,拿到委托单号,拿到上一个洁净编号A
|
|
//1b.如果receive_remark是H01,拿到委托单号,拿到上一个洁净编号A
|
|
@@ -1513,6 +1520,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
oci.setLoadEndTime(gc.getTime());
|
|
oci.setLoadEndTime(gc.getTime());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ oci.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(oci);
|
|
meterWorkCarActualFirstMapper.insertSelective(oci);
|
|
|
|
|
|
|
|
//2、修改预环节为使用
|
|
//2、修改预环节为使用
|
|
@@ -1949,6 +1957,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
String iActualNo = PublicMethod.IdCreate(3);
|
|
String iActualNo = PublicMethod.IdCreate(3);
|
|
|
secondDb.setActualFirstNo(iActualNo);
|
|
secondDb.setActualFirstNo(iActualNo);
|
|
|
|
|
|
|
|
|
|
+ secondDb.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(secondDb);
|
|
meterWorkCarActualFirstMapper.insertSelective(secondDb);
|
|
|
if (!secondDb.getPredictionNo().equals(netDb.getPredictionNo())) {
|
|
if (!secondDb.getPredictionNo().equals(netDb.getPredictionNo())) {
|
|
|
//杨秀东2021-3-22;一车联运检化验处理;
|
|
//杨秀东2021-3-22;一车联运检化验处理;
|
|
@@ -1983,6 +1992,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
netDb.setNetWeight(net);
|
|
netDb.setNetWeight(net);
|
|
|
}
|
|
}
|
|
|
netDb.setUploadFlag("1");
|
|
netDb.setUploadFlag("1");
|
|
|
|
|
+ netDb.setCreateTime(new Date());
|
|
|
meterWorkCarActualMapper.insertSelective(netDb);
|
|
meterWorkCarActualMapper.insertSelective(netDb);
|
|
|
|
|
|
|
|
//7、修改第一次存储的计量数据状态为洁净;预报编号相同时才处理(不是一车联运非互锁式)
|
|
//7、修改第一次存储的计量数据状态为洁净;预报编号相同时才处理(不是一车联运非互锁式)
|
|
@@ -2208,6 +2218,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
oci.setActualFirstNo(iActualNo);
|
|
oci.setActualFirstNo(iActualNo);
|
|
|
|
|
|
|
|
oci.setValueFlag("2");
|
|
oci.setValueFlag("2");
|
|
|
|
|
+ oci.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(oci);
|
|
meterWorkCarActualFirstMapper.insertSelective(oci);
|
|
|
//2、补充期限皮重的数据
|
|
//2、补充期限皮重的数据
|
|
|
MeterBaseTermTareData mbttd = meterBaseTermTareDataMapper.selectByPrimaryKey(netDb.getActualFirst2No());
|
|
MeterBaseTermTareData mbttd = meterBaseTermTareDataMapper.selectByPrimaryKey(netDb.getActualFirst2No());
|
|
@@ -2249,6 +2260,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
net = new BigDecimal(String.valueOf(netDb.getNetWeight())).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
net = new BigDecimal(String.valueOf(netDb.getNetWeight())).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
netDb.setNetWeight(net);
|
|
netDb.setNetWeight(net);
|
|
|
}
|
|
}
|
|
|
|
|
+ netDb.setCreateTime(new Date());
|
|
|
meterWorkCarActualMapper.insertSelective(netDb);
|
|
meterWorkCarActualMapper.insertSelective(netDb);
|
|
|
|
|
|
|
|
//4、修改预报
|
|
//4、修改预报
|
|
@@ -2463,6 +2475,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
oci.setActualFirstNo(no);
|
|
oci.setActualFirstNo(no);
|
|
|
|
|
|
|
|
oci.setValueFlag("1");
|
|
oci.setValueFlag("1");
|
|
|
|
|
+ oci.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(oci);
|
|
meterWorkCarActualFirstMapper.insertSelective(oci);
|
|
|
|
|
|
|
|
//6、存储图片
|
|
//6、存储图片
|
|
@@ -2530,6 +2543,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
String iActualNo = PublicMethod.IdCreate(3);
|
|
String iActualNo = PublicMethod.IdCreate(3);
|
|
|
secondDb.setActualFirstNo(iActualNo);
|
|
secondDb.setActualFirstNo(iActualNo);
|
|
|
|
|
|
|
|
|
|
+ secondDb.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(secondDb);
|
|
meterWorkCarActualFirstMapper.insertSelective(secondDb);
|
|
|
|
|
|
|
|
|
|
|
|
@@ -2561,6 +2575,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
netDb.setNetWeight(net);
|
|
netDb.setNetWeight(net);
|
|
|
}
|
|
}
|
|
|
netDb.setUploadFlag("1");
|
|
netDb.setUploadFlag("1");
|
|
|
|
|
+ netDb.setCreateTime(new Date());
|
|
|
meterWorkCarActualMapper.insertSelective(netDb);
|
|
meterWorkCarActualMapper.insertSelective(netDb);
|
|
|
|
|
|
|
|
//7、修改第一次存储的计量数据状态为洁净;预报编号相同时才处理(不是一车联运非互锁式)
|
|
//7、修改第一次存储的计量数据状态为洁净;预报编号相同时才处理(不是一车联运非互锁式)
|
|
@@ -2632,6 +2647,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
} else {
|
|
} else {
|
|
|
netDb1.setActualFirst2No(secondDb.getActualFirstNo());
|
|
netDb1.setActualFirst2No(secondDb.getActualFirstNo());
|
|
|
}
|
|
}
|
|
|
|
|
+ secondDb.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(secondDb);
|
|
meterWorkCarActualFirstMapper.insertSelective(secondDb);
|
|
|
|
|
|
|
|
// 第二条洁净数据的一次重量数据
|
|
// 第二条洁净数据的一次重量数据
|
|
@@ -2665,6 +2681,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
net = new BigDecimal(String.valueOf(netDb1.getNetWeight())).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
net = new BigDecimal(String.valueOf(netDb1.getNetWeight())).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
netDb1.setNetWeight(net);
|
|
netDb1.setNetWeight(net);
|
|
|
}
|
|
}
|
|
|
|
|
+ netDb1.setCreateTime(new Date());
|
|
|
meterWorkCarActualMapper.insertSelective(netDb1);
|
|
meterWorkCarActualMapper.insertSelective(netDb1);
|
|
|
|
|
|
|
|
|
|
|
|
@@ -2720,6 +2737,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
String no = PublicMethod.IdCreate(3);
|
|
String no = PublicMethod.IdCreate(3);
|
|
|
oci.setActualFirstNo(no);
|
|
oci.setActualFirstNo(no);
|
|
|
oci.setValueFlag("1");
|
|
oci.setValueFlag("1");
|
|
|
|
|
+ oci.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(oci);
|
|
meterWorkCarActualFirstMapper.insertSelective(oci);
|
|
|
|
|
|
|
|
//根据车号加预报编号修改 craneActualMapper
|
|
//根据车号加预报编号修改 craneActualMapper
|
|
@@ -2776,6 +2794,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
oci.setActualFirstNo(no);
|
|
oci.setActualFirstNo(no);
|
|
|
|
|
|
|
|
oci.setValueFlag("2");
|
|
oci.setValueFlag("2");
|
|
|
|
|
+ oci.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(oci);
|
|
meterWorkCarActualFirstMapper.insertSelective(oci);
|
|
|
|
|
|
|
|
netDB.setActualFirst2No(oci.getActualFirstNo());
|
|
netDB.setActualFirst2No(oci.getActualFirstNo());
|
|
@@ -2792,6 +2811,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(firstDb);
|
|
meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(firstDb);
|
|
|
|
|
|
|
|
//3、存储数据到洁净表
|
|
//3、存储数据到洁净表
|
|
|
|
|
+ netDB.setCreateTime(new Date());
|
|
|
meterWorkCarActualMapper.insert(netDB);
|
|
meterWorkCarActualMapper.insert(netDB);
|
|
|
|
|
|
|
|
//4、根据车号加预报编号修改 craneActualMapper
|
|
//4、根据车号加预报编号修改 craneActualMapper
|
|
@@ -2846,6 +2866,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
String firstNo01 = PublicMethod.IdCreate(3);
|
|
String firstNo01 = PublicMethod.IdCreate(3);
|
|
|
first02.setActualFirstNo(firstNo01);
|
|
first02.setActualFirstNo(firstNo01);
|
|
|
|
|
|
|
|
|
|
+ first02.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(first02);
|
|
meterWorkCarActualFirstMapper.insertSelective(first02);
|
|
|
|
|
|
|
|
MeterWorkCarActual actualRow = new MeterWorkCarActual();
|
|
MeterWorkCarActual actualRow = new MeterWorkCarActual();
|
|
@@ -2920,6 +2941,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
actualRow.setPredictionNo(scale.getPredictionNo());
|
|
actualRow.setPredictionNo(scale.getPredictionNo());
|
|
|
actualRow.setPredictionType("7");
|
|
actualRow.setPredictionType("7");
|
|
|
actualRow.setNetWeight(first02.getMeterWeight().subtract(model02.getMeterWeight()));
|
|
actualRow.setNetWeight(first02.getMeterWeight().subtract(model02.getMeterWeight()));
|
|
|
|
|
+
|
|
|
meterWorkCarActualMapper.insertSelective(actualRow);
|
|
meterWorkCarActualMapper.insertSelective(actualRow);
|
|
|
|
|
|
|
|
} else if (first02.getWeightType().equals("1")) { //混卸
|
|
} else if (first02.getWeightType().equals("1")) { //混卸
|
|
@@ -2999,6 +3021,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
first03.setActualFirstNo(fristNo03);
|
|
first03.setActualFirstNo(fristNo03);
|
|
|
|
|
|
|
|
first03.setIsPreScale("0");
|
|
first03.setIsPreScale("0");
|
|
|
|
|
+ first03.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(first03);
|
|
meterWorkCarActualFirstMapper.insertSelective(first03);
|
|
|
}
|
|
}
|
|
|
//6、修改计量监控
|
|
//6、修改计量监控
|
|
@@ -3039,7 +3062,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
|
|
|
|
|
String firstNo01 = PublicMethod.IdCreate(3);
|
|
String firstNo01 = PublicMethod.IdCreate(3);
|
|
|
one.setActualFirstNo(firstNo01);
|
|
one.setActualFirstNo(firstNo01);
|
|
|
-
|
|
|
|
|
|
|
+ one.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(one);
|
|
meterWorkCarActualFirstMapper.insertSelective(one);
|
|
|
|
|
|
|
|
MeterWorkCarActualFirst model01 = new MeterWorkCarActualFirst();
|
|
MeterWorkCarActualFirst model01 = new MeterWorkCarActualFirst();
|
|
@@ -3131,6 +3154,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
model03.setPredictionNo(scale02.getPredictionNo());
|
|
model03.setPredictionNo(scale02.getPredictionNo());
|
|
|
model03.setPredictionType("5");
|
|
model03.setPredictionType("5");
|
|
|
model03.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
|
|
model03.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
|
|
|
|
|
+ model03.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(model03);
|
|
meterWorkCarActualFirstMapper.insertSelective(model03);
|
|
|
//添加第二次皮重数据库
|
|
//添加第二次皮重数据库
|
|
|
// String actualSecondNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
|
|
// String actualSecondNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
|
|
@@ -3147,6 +3171,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
model04.setPredictionNo(scale02.getPredictionNo());
|
|
model04.setPredictionNo(scale02.getPredictionNo());
|
|
|
model04.setPredictionType("5");
|
|
model04.setPredictionType("5");
|
|
|
model04.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
|
|
model04.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
|
|
|
|
|
+ model04.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(model04);
|
|
meterWorkCarActualFirstMapper.insertSelective(model04);
|
|
|
|
|
|
|
|
//将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
|
|
//将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
|
|
@@ -3358,6 +3383,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
mwcaf3.setPredictionNo(predictionNo2);
|
|
mwcaf3.setPredictionNo(predictionNo2);
|
|
|
mwcaf3.setPredictionType("7");
|
|
mwcaf3.setPredictionType("7");
|
|
|
mwcaf3.setPredictionCombination(predictionNo1 + "," + predictionNo2);
|
|
mwcaf3.setPredictionCombination(predictionNo1 + "," + predictionNo2);
|
|
|
|
|
+ mwcaf3.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(mwcaf3);
|
|
meterWorkCarActualFirstMapper.insertSelective(mwcaf3);
|
|
|
//更新第二次毛重数据
|
|
//更新第二次毛重数据
|
|
|
mwcaf4.setValueFlag(DbConstants.NET);
|
|
mwcaf4.setValueFlag(DbConstants.NET);
|
|
@@ -3547,6 +3573,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
mwcaf3.setPredictionNo(predictionNo2);
|
|
mwcaf3.setPredictionNo(predictionNo2);
|
|
|
mwcaf3.setPredictionType("6");
|
|
mwcaf3.setPredictionType("6");
|
|
|
mwcaf3.setPredictionCombination(predictionNo1 + "," + predictionNo2);
|
|
mwcaf3.setPredictionCombination(predictionNo1 + "," + predictionNo2);
|
|
|
|
|
+ mwcaf3.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(mwcaf3);
|
|
meterWorkCarActualFirstMapper.insertSelective(mwcaf3);
|
|
|
//更新第二次皮重数据
|
|
//更新第二次皮重数据
|
|
|
mwcaf4.setValueFlag(DbConstants.NET);
|
|
mwcaf4.setValueFlag(DbConstants.NET);
|
|
@@ -3751,6 +3778,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
mwcaf03.setPredictionNo(predictionNo2);
|
|
mwcaf03.setPredictionNo(predictionNo2);
|
|
|
mwcaf03.setPredictionType("5");
|
|
mwcaf03.setPredictionType("5");
|
|
|
mwcaf03.setPredictionCombination(predictionNo1 + "," + predictionNo2);
|
|
mwcaf03.setPredictionCombination(predictionNo1 + "," + predictionNo2);
|
|
|
|
|
+ mwcaf03.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(mwcaf03);
|
|
meterWorkCarActualFirstMapper.insertSelective(mwcaf03);
|
|
|
//添加第二次皮重数据库
|
|
//添加第二次皮重数据库
|
|
|
SimpleDateFormat sdf01 = new SimpleDateFormat("yyyyMMdd");
|
|
SimpleDateFormat sdf01 = new SimpleDateFormat("yyyyMMdd");
|
|
@@ -3768,6 +3796,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
mwcaf04.setPredictionNo(predictionNo2);
|
|
mwcaf04.setPredictionNo(predictionNo2);
|
|
|
mwcaf04.setPredictionType("5");
|
|
mwcaf04.setPredictionType("5");
|
|
|
mwcaf04.setPredictionCombination(predictionNo1 + "," + predictionNo2);
|
|
mwcaf04.setPredictionCombination(predictionNo1 + "," + predictionNo2);
|
|
|
|
|
+ mwcaf04.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(mwcaf04);
|
|
meterWorkCarActualFirstMapper.insertSelective(mwcaf04);
|
|
|
|
|
|
|
|
//将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
|
|
//将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
|
|
@@ -3792,6 +3821,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
actualRow1.setPredictionType("5");
|
|
actualRow1.setPredictionType("5");
|
|
|
actualRow1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
|
|
actualRow1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
|
|
|
actualRow1.setNetWeight(mwcaf01.getMeterWeight().subtract(mwcaf02.getMeterWeight()));
|
|
actualRow1.setNetWeight(mwcaf01.getMeterWeight().subtract(mwcaf02.getMeterWeight()));
|
|
|
|
|
+ actualRow1.setCreateTime(new Date());
|
|
|
meterWorkCarActualMapper.insertSelective(actualRow1);
|
|
meterWorkCarActualMapper.insertSelective(actualRow1);
|
|
|
|
|
|
|
|
// String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
|
|
// String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
|
|
@@ -3809,6 +3839,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
actualRow2.setPredictionType("5");
|
|
actualRow2.setPredictionType("5");
|
|
|
actualRow2.setPredictionCombination(predictionNo1 + "," + predictionNo2);
|
|
actualRow2.setPredictionCombination(predictionNo1 + "," + predictionNo2);
|
|
|
actualRow2.setNetWeight(mwcaf03.getMeterWeight().subtract(mwcaf04.getMeterWeight()));
|
|
actualRow2.setNetWeight(mwcaf03.getMeterWeight().subtract(mwcaf04.getMeterWeight()));
|
|
|
|
|
+ actualRow2.setCreateTime(new Date());
|
|
|
meterWorkCarActualMapper.insertSelective(actualRow2);
|
|
meterWorkCarActualMapper.insertSelective(actualRow2);
|
|
|
|
|
|
|
|
rm.setSucceed();
|
|
rm.setSucceed();
|
|
@@ -3849,6 +3880,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
secondDb.setActualFirstNo(no);
|
|
secondDb.setActualFirstNo(no);
|
|
|
|
|
|
|
|
secondDb.setValueFlag("2");//洁净
|
|
secondDb.setValueFlag("2");//洁净
|
|
|
|
|
+ secondDb.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(secondDb);
|
|
meterWorkCarActualFirstMapper.insertSelective(secondDb);
|
|
|
|
|
|
|
|
// String no1 = meterWorkCarActualMapper.getNewID(afl);
|
|
// String no1 = meterWorkCarActualMapper.getNewID(afl);
|
|
@@ -3863,6 +3895,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
}
|
|
}
|
|
|
netDb.setUploadFlag("1");
|
|
netDb.setUploadFlag("1");
|
|
|
netDb.setActualFirst1No(secondDb.getActualFirstNo());
|
|
netDb.setActualFirst1No(secondDb.getActualFirstNo());
|
|
|
|
|
+ netDb.setCreateTime(new Date());
|
|
|
meterWorkCarActualMapper.insert(netDb);
|
|
meterWorkCarActualMapper.insert(netDb);
|
|
|
|
|
|
|
|
//4、将期限皮重转化为一条皮重计量数据保存
|
|
//4、将期限皮重转化为一条皮重计量数据保存
|
|
@@ -3997,6 +4030,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
model.setValueFlag("1");
|
|
model.setValueFlag("1");
|
|
|
model.setIsPreScale("0");
|
|
model.setIsPreScale("0");
|
|
|
model.setDataSource("3");
|
|
model.setDataSource("3");
|
|
|
|
|
+ model.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(model);
|
|
meterWorkCarActualFirstMapper.insertSelective(model);
|
|
|
num++;
|
|
num++;
|
|
|
}
|
|
}
|
|
@@ -4077,6 +4111,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
actualFirst.setActualFirstNo(no);
|
|
actualFirst.setActualFirstNo(no);
|
|
|
|
|
|
|
|
actualFirst.setValueFlag("2");//未洁净
|
|
actualFirst.setValueFlag("2");//未洁净
|
|
|
|
|
+ actualFirst.setCreateTime(new Date());
|
|
|
int i = meterWorkCarActualFirstMapper.insertSelective(actualFirst);
|
|
int i = meterWorkCarActualFirstMapper.insertSelective(actualFirst);
|
|
|
|
|
|
|
|
//将毛重委托匹配到皮重中
|
|
//将毛重委托匹配到皮重中
|
|
@@ -4106,6 +4141,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
meterWorkCarActual.setIsPreScale("1");
|
|
meterWorkCarActual.setIsPreScale("1");
|
|
|
meterWorkCarActual.setValueFlag("1");
|
|
meterWorkCarActual.setValueFlag("1");
|
|
|
meterWorkCarActual.setNetWeight(model.getMeterWeight().subtract(actualFirst.getMeterWeight()));
|
|
meterWorkCarActual.setNetWeight(model.getMeterWeight().subtract(actualFirst.getMeterWeight()));
|
|
|
|
|
+ meterWorkCarActual.setCreateTime(new Date());
|
|
|
meterWorkCarActualMapper.insertSelective(meterWorkCarActual);
|
|
meterWorkCarActualMapper.insertSelective(meterWorkCarActual);
|
|
|
|
|
|
|
|
PreTrackScale preTrackScale = new PreTrackScale();
|
|
PreTrackScale preTrackScale = new PreTrackScale();
|
|
@@ -4157,6 +4193,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
String no = PublicMethod.IdCreate(3);
|
|
String no = PublicMethod.IdCreate(3);
|
|
|
secondDb.setActualFirstNo(no);
|
|
secondDb.setActualFirstNo(no);
|
|
|
secondDb.setValueFlag("2");//洁净
|
|
secondDb.setValueFlag("2");//洁净
|
|
|
|
|
+ secondDb.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(secondDb);
|
|
meterWorkCarActualFirstMapper.insertSelective(secondDb);
|
|
|
|
|
|
|
|
//修改一次计量数据为洁净
|
|
//修改一次计量数据为洁净
|
|
@@ -4200,6 +4237,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
netDb.setNetWeight(net);
|
|
netDb.setNetWeight(net);
|
|
|
}
|
|
}
|
|
|
netDb.setUploadFlag("1");
|
|
netDb.setUploadFlag("1");
|
|
|
|
|
+ netDb.setCreateTime(new Date());
|
|
|
meterWorkCarActualMapper.insert(netDb);
|
|
meterWorkCarActualMapper.insert(netDb);
|
|
|
|
|
|
|
|
//4、如果为期限皮重,则将期限皮重转化为一条皮重计量数据保存
|
|
//4、如果为期限皮重,则将期限皮重转化为一条皮重计量数据保存
|
|
@@ -4314,6 +4352,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
String no1 = PublicMethod.IdCreate(3);
|
|
String no1 = PublicMethod.IdCreate(3);
|
|
|
grossModel.setActualFirstNo(no1);
|
|
grossModel.setActualFirstNo(no1);
|
|
|
grossModel.setValueFlag("2");//洁净
|
|
grossModel.setValueFlag("2");//洁净
|
|
|
|
|
+ grossModel.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(grossModel);
|
|
meterWorkCarActualFirstMapper.insertSelective(grossModel);
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
@@ -4324,6 +4363,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
String no1 = PublicMethod.IdCreate(3);
|
|
String no1 = PublicMethod.IdCreate(3);
|
|
|
tareModel.setActualFirstNo(no1);
|
|
tareModel.setActualFirstNo(no1);
|
|
|
tareModel.setValueFlag("2");//洁净
|
|
tareModel.setValueFlag("2");//洁净
|
|
|
|
|
+ tareModel.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(tareModel);
|
|
meterWorkCarActualFirstMapper.insertSelective(tareModel);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -4382,6 +4422,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
model.setPredictionNo(scale.getPredictionNo());
|
|
model.setPredictionNo(scale.getPredictionNo());
|
|
|
model.setPredictionType("1");
|
|
model.setPredictionType("1");
|
|
|
model.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
|
|
model.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
|
|
|
|
|
+ model.setCreateTime(new Date());
|
|
|
meterWorkCarActualMapper.insertSelective(model);
|
|
meterWorkCarActualMapper.insertSelective(model);
|
|
|
} else {
|
|
} else {
|
|
|
rm.setMessage("委托信息编号不能为空,请确认!!");
|
|
rm.setMessage("委托信息编号不能为空,请确认!!");
|
|
@@ -4543,6 +4584,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
|
|
|
|
|
tare.setValueFlag("0");//洁净
|
|
tare.setValueFlag("0");//洁净
|
|
|
tare.setWeightType("1");
|
|
tare.setWeightType("1");
|
|
|
|
|
+ tare.setCreateTime(new Date());
|
|
|
meterWorkCarActualFirstMapper.insertSelective(tare);
|
|
meterWorkCarActualFirstMapper.insertSelective(tare);
|
|
|
|
|
|
|
|
//将皮重数据保存或更新到期限皮中
|
|
//将皮重数据保存或更新到期限皮中
|
|
@@ -4644,6 +4686,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
|
|
|
mwca.setPredictionNo(model.getPredictionNo());
|
|
mwca.setPredictionNo(model.getPredictionNo());
|
|
|
mwca.setPredictionType("1");
|
|
mwca.setPredictionType("1");
|
|
|
mwca.setNetWeight(model.getMeterWeight().subtract(imTare.getMeterWeight()));
|
|
mwca.setNetWeight(model.getMeterWeight().subtract(imTare.getMeterWeight()));
|
|
|
|
|
+ mwca.setCreateTime(new Date());
|
|
|
meterWorkCarActualMapper.insertSelective(mwca);
|
|
meterWorkCarActualMapper.insertSelective(mwca);
|
|
|
|
|
|
|
|
//修改委托
|
|
//修改委托
|