标志皮主键修改

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -2118,7 +2118,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         String afl = sdf.format(new Date());
         String firstNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
         tareModel.setActualFirstNo(firstNo);
-        tareModel.setMeterWeight(new BigDecimal(tareWeight));
+        BigDecimal weight = (new BigDecimal(tareWeight)).multiply(new BigDecimal(1000));
+        tareModel.setMeterWeight(weight);
         tareModel.setWeightType("4");
         int i = meterWorkRailwayActFirstMapper.insert(tareModel);
 
@@ -4378,13 +4379,14 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             String afl = sdf.format(new Date());
             //一次毛重数据
             MeterWorkRailwayActFirst grossModel = model;
-            model.setActualFirstNo(afl + meterWorkRailwayActFirstMapper.getNewID(afl));
+            grossModel.setActualFirstNo(afl + meterWorkRailwayActFirstMapper.getNewID(afl));
+            grossModel.setWeightType("0");
+            meterWorkRailwayActFirstMapper.insertSelective(grossModel);
             //标识皮重保存
-            MeterWorkRailwayActFirst tareModel = model;
-            tareModel.setPredictionNo(afl + meterWorkRailwayActFirstMapper.getNewID(afl));
+            MeterWorkRailwayActFirst tareModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(grossModel.getActualFirstNo());
+            tareModel.setActualFirstNo(afl + meterWorkRailwayActFirstMapper.getNewID(afl));
             tareModel.setMeterWeight(model.getRailwayFactoryWeight());
-
-            meterWorkRailwayActFirstMapper.insertSelective(grossModel);
+            tareModel.setWeightType("1");
             meterWorkRailwayActFirstMapper.insertSelective(tareModel);
 
             MeterWorkRailwayActual actualRow = new MeterWorkRailwayActual();
@@ -4498,7 +4500,6 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             actuals.add(actualRow);
             meterWorkRailwayActFirstMapper.deleteByPrimaryKey(tareModel.getActualFirstNo());
 
-            actuals.add(actualRow);
             map.put("firsts", firsts);
             map.put("actuals", actuals);