汽车衡和轨道衡的净重时间、结净人员编号、结净人员、结净人、创建时间、创建人取毛皮最新的信息；取消校秤接口（修改为24之内再后面十分钟）；轨道衡委托添加使用站点编号和使用站点名称

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -120,6 +120,23 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             check(model);
             model.setUploadFlag("1");
             model.setCreateTime(new Date());
+            if(model.getGrossTime().compareTo(model.getTareTime()) >= 0) {
+                model.setNetSpot3No(model.getBaseSpot1No());
+                model.setNetSpot3Name(model.getBaseSpot1Name());
+                model.setNetManNo(model.getGrossManNo());
+                model.setNetManName(model.getGrossManName());
+                model.setNetTime(model.getGrossTime());
+                model.setCreateTime(model.getGrossTime());
+                model.setCreateManName(model.getGrossManName());
+            }else {
+                model.setNetSpot3No(model.getBaseSpot2No());
+                model.setNetSpot3Name(model.getBaseSpot2Name());
+                model.setNetManNo(model.getTareManNo());
+                model.setNetManName(model.getTareManName());
+                model.setNetTime(model.getTareTime());
+                model.setCreateTime(model.getTareTime());
+                model.setCreateManName(model.getTareManName());
+            }
             int num = meterWorkCarActualMapper.insertSelective(model);
             return num;
         } catch (MarkerMetException e) {
@@ -351,6 +368,23 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 actualRow.setIsPreScale("1");
                 actualRow.setNetWeight(mwcaf1.getMeterWeight().subtract(mwcaf2.getMeterWeight()));
                 actualRow.setCreateTime(new Date());
+                if(actualRow.getGrossTime().compareTo(actualRow.getTareTime()) >= 0) {
+                    actualRow.setNetSpot3No(actualRow.getBaseSpot1No());
+                    actualRow.setNetSpot3Name(actualRow.getBaseSpot1Name());
+                    actualRow.setNetManNo(actualRow.getGrossManNo());
+                    actualRow.setNetManName(actualRow.getGrossManName());
+                    actualRow.setNetTime(actualRow.getGrossTime());
+                    actualRow.setCreateTime(actualRow.getGrossTime());
+                    actualRow.setCreateManName(actualRow.getGrossManName());
+                }else {
+                    actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
+                    actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
+                    actualRow.setNetManNo(actualRow.getTareManNo());
+                    actualRow.setNetManName(actualRow.getTareManName());
+                    actualRow.setNetTime(actualRow.getTareTime());
+                    actualRow.setCreateTime(actualRow.getTareTime());
+                    actualRow.setCreateManName(actualRow.getTareManName());
+                }
                 meterWorkCarActualMapper.insertSelective(actualRow);
 
                 PreTrackScale scale = preTrackScaleMapper.selectByPrimaryKey(predictionNo);
@@ -417,6 +451,23 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         actualRow.setIsPreScale("1");
                         actualRow.setNetWeight(mwcaf1.getMeterWeight().subtract(mwcaf2.getMeterWeight()));
                         actualRow.setCreateTime(new Date());
+                        if(actualRow.getGrossTime().compareTo(actualRow.getTareTime()) >= 0) {
+                            actualRow.setNetSpot3No(actualRow.getBaseSpot1No());
+                            actualRow.setNetSpot3Name(actualRow.getBaseSpot1Name());
+                            actualRow.setNetManNo(actualRow.getGrossManNo());
+                            actualRow.setNetManName(actualRow.getGrossManName());
+                            actualRow.setNetTime(actualRow.getGrossTime());
+                            actualRow.setCreateTime(actualRow.getGrossTime());
+                            actualRow.setCreateManName(actualRow.getGrossManName());
+                        }else {
+                            actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
+                            actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
+                            actualRow.setNetManNo(actualRow.getTareManNo());
+                            actualRow.setNetManName(actualRow.getTareManName());
+                            actualRow.setNetTime(actualRow.getTareTime());
+                            actualRow.setCreateTime(actualRow.getTareTime());
+                            actualRow.setCreateManName(actualRow.getTareManName());
+                        }
                         meterWorkCarActualMapper.insertSelective(actualRow);
 
                         scale.setValueFlag(DbConstants.NET);
@@ -468,6 +519,23 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 actualRow.setIsPreScale("0");
                 actualRow.setNetWeight(first1.getMeterWeight().subtract(first2.getMeterWeight()));
                 actualRow.setCreateTime(new Date());
+                if(actualRow.getGrossTime().compareTo(actualRow.getTareTime()) >= 0) {
+                    actualRow.setNetSpot3No(actualRow.getBaseSpot1No());
+                    actualRow.setNetSpot3Name(actualRow.getBaseSpot1Name());
+                    actualRow.setNetManNo(actualRow.getGrossManNo());
+                    actualRow.setNetManName(actualRow.getGrossManName());
+                    actualRow.setNetTime(actualRow.getGrossTime());
+                    actualRow.setCreateTime(actualRow.getGrossTime());
+                    actualRow.setCreateManName(actualRow.getGrossManName());
+                }else {
+                    actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
+                    actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
+                    actualRow.setNetManNo(actualRow.getTareManNo());
+                    actualRow.setNetManName(actualRow.getTareManName());
+                    actualRow.setNetTime(actualRow.getTareTime());
+                    actualRow.setCreateTime(actualRow.getTareTime());
+                    actualRow.setCreateManName(actualRow.getTareManName());
+                }
                 meterWorkCarActualMapper.insertSelective(actualRow);
             }
             return actualRow;
@@ -491,6 +559,9 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 throw new MarkerMetException(500, "参数为空！！！");
             }
             for(MeterWorkCarActual modelTemp: models) {
+                if(modelTemp.getIsPreScale().equals("1")) {
+                    throw new MarkerMetException(500, "请将结净数据解除委托之后在毛皮分解");
+                }
                 if(modelTemp.getPredictionNo() != null && StringUtils.isNotEmpty(modelTemp.getPredictionNo())){
                     PreTrackScale scaleTemp = preTrackScaleMapper.selectByPrimaryKey(modelTemp.getPredictionNo());
                     if(scaleTemp.getValueFlag().equals("9")) {
@@ -567,6 +638,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 //meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
                 model.setUploadFlag("1");
                 model.setValueFlag("0");
+                model.setIsPreScale("0");
                 meterWorkCarActualMapper.updateByPrimaryKey(model);
                 num++;
             }
@@ -877,6 +949,23 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             // 校验传入数据是否完整
             manualCheck(model);
             model.setCreateTime(new Date());
+            if(model.getGrossTime().compareTo(model.getTareTime()) >= 0) {
+                model.setNetSpot3No(model.getBaseSpot1No());
+                model.setNetSpot3Name(model.getBaseSpot1Name());
+                model.setNetManNo(model.getGrossManNo());
+                model.setNetManName(model.getGrossManName());
+                model.setNetTime(model.getGrossTime());
+                model.setCreateTime(model.getGrossTime());
+                model.setCreateManName(model.getGrossManName());
+            }else {
+                model.setNetSpot3No(model.getBaseSpot2No());
+                model.setNetSpot3Name(model.getBaseSpot2Name());
+                model.setNetManNo(model.getTareManNo());
+                model.setNetManName(model.getTareManName());
+                model.setNetTime(model.getTareTime());
+                model.setCreateTime(model.getTareTime());
+                model.setCreateManName(model.getTareManName());
+            }
             int num = meterWorkCarActualMapper.insertSelective(model);
             return num;
         } catch (MarkerMetException e) {
@@ -1196,7 +1285,24 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
 
             mwca.setUploadFlag("1");
             mwca.setNetWeight(mwcaf1.getMeterWeight().subtract(mbttd.getMeterWeight()));
-            mwca.setCreateTime(new Date());
+            //mwca.setCreateTime(new Date());
+            if(mwca.getGrossTime().compareTo(mwca.getTareTime()) >= 0) {
+                mwca.setNetSpot3No(mwca.getBaseSpot1No());
+                mwca.setNetSpot3Name(mwca.getBaseSpot1Name());
+                mwca.setNetManNo(mwca.getGrossManNo());
+                mwca.setNetManName(mwca.getGrossManName());
+                mwca.setNetTime(mwca.getGrossTime());
+                mwca.setCreateTime(mwca.getGrossTime());
+                mwca.setCreateManName(mwca.getGrossManName());
+            }else {
+                mwca.setNetSpot3No(mwca.getBaseSpot2No());
+                mwca.setNetSpot3Name(mwca.getBaseSpot2Name());
+                mwca.setNetManNo(mwca.getTareManNo());
+                mwca.setNetManName(mwca.getTareManName());
+                mwca.setNetTime(mwca.getTareTime());
+                mwca.setCreateTime(mwca.getTareTime());
+                mwca.setCreateManName(mwca.getTareManName());
+            }
             meterWorkCarActualMapper.insertSelective(mwca);
 
             //修改预报
@@ -1555,6 +1661,23 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         carActual.setActualFirst2No(""); //皮重编号
         carActual.setUploadFlag("1");
         carActual.setCreateTime(new Date());
+        if(carActual.getGrossTime().compareTo(carActual.getTareTime()) >= 0) {
+            carActual.setNetSpot3No(carActual.getBaseSpot1No());
+            carActual.setNetSpot3Name(carActual.getBaseSpot1Name());
+            carActual.setNetManNo(carActual.getGrossManNo());
+            carActual.setNetManName(carActual.getGrossManName());
+            carActual.setNetTime(carActual.getGrossTime());
+            carActual.setCreateTime(carActual.getGrossTime());
+            carActual.setCreateManName(carActual.getGrossManName());
+        }else {
+            carActual.setNetSpot3No(carActual.getBaseSpot2No());
+            carActual.setNetSpot3Name(carActual.getBaseSpot2Name());
+            carActual.setNetManNo(carActual.getTareManNo());
+            carActual.setNetManName(carActual.getTareManName());
+            carActual.setNetTime(carActual.getTareTime());
+            carActual.setCreateTime(carActual.getTareTime());
+            carActual.setCreateManName(carActual.getTareManName());
+        }
         meterWorkCarActualMapper.insert(carActual);
 
         railwayActual.setMemo(railwayActual.getMemo() + "汽车实绩转换，转换净重" + railwayActual.getNetWeight() + "");
@@ -1635,6 +1758,23 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             actual.setValueFlag(DbConstants.INVALID);
             actual.setUploadFlag("1");
             actual.setCreateTime(new Date());
+            if(actual.getGrossTime().compareTo(actual.getTareTime()) >= 0) {
+                actual.setNetSpot3No(actual.getBaseSpot1No());
+                actual.setNetSpot3Name(actual.getBaseSpot1Name());
+                actual.setNetManNo(actual.getGrossManNo());
+                actual.setNetManName(actual.getGrossManName());
+                actual.setNetTime(actual.getGrossTime());
+                actual.setCreateTime(actual.getGrossTime());
+                actual.setCreateManName(actual.getGrossManName());
+            }else {
+                actual.setNetSpot3No(actual.getBaseSpot2No());
+                actual.setNetSpot3Name(actual.getBaseSpot2Name());
+                actual.setNetManNo(actual.getTareManNo());
+                actual.setNetManName(actual.getTareManName());
+                actual.setNetTime(actual.getTareTime());
+                actual.setCreateTime(actual.getTareTime());
+                actual.setCreateManName(actual.getTareManName());
+            }
             meterWorkCarActualMapper.insertSelective(actual);
             return actual;
         } catch (MarkerMetException e) {
@@ -1701,6 +1841,23 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             actual.setValueFlag(DbConstants.INVALID);
             actual.setUploadFlag("1");
             actual.setCreateTime(new Date());
+            if(actual.getGrossTime().compareTo(actual.getTareTime()) >= 0) {
+                actual.setNetSpot3No(actual.getBaseSpot1No());
+                actual.setNetSpot3Name(actual.getBaseSpot1Name());
+                actual.setNetManNo(actual.getGrossManNo());
+                actual.setNetManName(actual.getGrossManName());
+                actual.setNetTime(actual.getGrossTime());
+                actual.setCreateTime(actual.getGrossTime());
+                actual.setCreateManName(actual.getGrossManName());
+            }else {
+                actual.setNetSpot3No(actual.getBaseSpot2No());
+                actual.setNetSpot3Name(actual.getBaseSpot2Name());
+                actual.setNetManNo(actual.getTareManNo());
+                actual.setNetManName(actual.getTareManName());
+                actual.setNetTime(actual.getTareTime());
+                actual.setCreateTime(actual.getTareTime());
+                actual.setCreateManName(actual.getTareManName());
+            }
             meterWorkCarActualMapper.insertSelective(actual);
 
             trackScale.setUpdateManNo(userId);
@@ -1927,6 +2084,23 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 model.setIsPreScale("0");
                 model.setUploadFlag("1");
                 model.setCreateTime(new Date());
+                if(model.getGrossTime().compareTo(model.getTareTime()) >= 0) {
+                    model.setNetSpot3No(model.getBaseSpot1No());
+                    model.setNetSpot3Name(model.getBaseSpot1Name());
+                    model.setNetManNo(model.getGrossManNo());
+                    model.setNetManName(model.getGrossManName());
+                    model.setNetTime(model.getGrossTime());
+                    model.setCreateTime(model.getGrossTime());
+                    model.setCreateManName(model.getGrossManName());
+                }else {
+                    model.setNetSpot3No(model.getBaseSpot2No());
+                    model.setNetSpot3Name(model.getBaseSpot2Name());
+                    model.setNetManNo(model.getTareManNo());
+                    model.setNetManName(model.getTareManName());
+                    model.setNetTime(model.getTareTime());
+                    model.setCreateTime(model.getTareTime());
+                    model.setCreateManName(model.getTareManName());
+                }
                 meterWorkCarActualMapper.insertSelective(model);
                 num++;
             }
@@ -1986,6 +2160,23 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 model.setDataSource("4");
                 model.setUploadFlag("1");
                 model.setCreateTime(new Date());
+                if(model.getGrossTime().compareTo(model.getTareTime()) >= 0) {
+                    model.setNetSpot3No(model.getBaseSpot1No());
+                    model.setNetSpot3Name(model.getBaseSpot1Name());
+                    model.setNetManNo(model.getGrossManNo());
+                    model.setNetManName(model.getGrossManName());
+                    model.setNetTime(model.getGrossTime());
+                    model.setCreateTime(model.getGrossTime());
+                    model.setCreateManName(model.getGrossManName());
+                }else {
+                    model.setNetSpot3No(model.getBaseSpot2No());
+                    model.setNetSpot3Name(model.getBaseSpot2Name());
+                    model.setNetManNo(model.getTareManNo());
+                    model.setNetManName(model.getTareManName());
+                    model.setNetTime(model.getTareTime());
+                    model.setCreateTime(model.getTareTime());
+                    model.setCreateManName(model.getTareManName());
+                }
                 meterWorkCarActualMapper.insertSelective(model);
 
                 preTrackScale.setValueFlag("2");
@@ -2108,6 +2299,23 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             actualRow.setCreateTime(new Date());
             actualRow.setPredictionNo(predictionNo);
             actualRow.setNetWeight(mwcaf1.getMeterWeight().subtract(mwcaf2.getMeterWeight()));
+            if(actualRow.getGrossTime().compareTo(actualRow.getTareTime()) >= 0) {
+                actualRow.setNetSpot3No(actualRow.getBaseSpot1No());
+                actualRow.setNetSpot3Name(actualRow.getBaseSpot1Name());
+                actualRow.setNetManNo(actualRow.getGrossManNo());
+                actualRow.setNetManName(actualRow.getGrossManName());
+                actualRow.setNetTime(actualRow.getGrossTime());
+                actualRow.setCreateTime(actualRow.getGrossTime());
+                actualRow.setCreateManName(actualRow.getGrossManName());
+            }else {
+                actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
+                actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
+                actualRow.setNetManNo(actualRow.getTareManNo());
+                actualRow.setNetManName(actualRow.getTareManName());
+                actualRow.setNetTime(actualRow.getTareTime());
+                actualRow.setCreateTime(actualRow.getTareTime());
+                actualRow.setCreateManName(actualRow.getTareManName());
+            }
             meterWorkCarActualMapper.insertSelective(actualRow);
             rm.setSucceed();
             rm.setMessage("操作成功！！！");

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

@@ -1258,6 +1258,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             }
             netDb.setUploadFlag("1");
             netDb.setCreateTime(new Date());
+            if(netDb.getGrossTime().compareTo(netDb.getTareTime()) >= 0) {
+                netDb.setNetSpot3No(netDb.getBaseSpot1No());
+                netDb.setNetSpot3Name(netDb.getBaseSpot1Name());
+                netDb.setNetManNo(netDb.getGrossManNo());
+                netDb.setNetManName(netDb.getGrossManName());
+                netDb.setNetTime(netDb.getGrossTime());
+                netDb.setCreateTime(netDb.getGrossTime());
+                netDb.setCreateManName(netDb.getGrossManName());
+            }else {
+                netDb.setNetSpot3No(netDb.getBaseSpot2No());
+                netDb.setNetSpot3Name(netDb.getBaseSpot2Name());
+                netDb.setNetManNo(netDb.getTareManNo());
+                netDb.setNetManName(netDb.getTareManName());
+                netDb.setNetTime(netDb.getTareTime());
+                netDb.setCreateTime(netDb.getTareTime());
+                netDb.setCreateManName(netDb.getTareManName());
+            }
             meterWorkCarActualMapper.insert(netDb);
 
             //4、如果为期限皮重，则将期限皮重转化为一条皮重计量数据保存
@@ -1433,6 +1450,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             // 拿到洁净编号B
             netDb.setPredictionCombination(upModel.getPredictionNo() + "," + netDb.getPredictionNo());
             netDb.setCreateTime(new Date());
+            if(netDb.getGrossTime().compareTo(netDb.getTareTime()) >= 0) {
+                netDb.setNetSpot3No(netDb.getBaseSpot1No());
+                netDb.setNetSpot3Name(netDb.getBaseSpot1Name());
+                netDb.setNetManNo(netDb.getGrossManNo());
+                netDb.setNetManName(netDb.getGrossManName());
+                netDb.setNetTime(netDb.getGrossTime());
+                netDb.setCreateTime(netDb.getGrossTime());
+                netDb.setCreateManName(netDb.getGrossManName());
+            }else {
+                netDb.setNetSpot3No(netDb.getBaseSpot2No());
+                netDb.setNetSpot3Name(netDb.getBaseSpot2Name());
+                netDb.setNetManNo(netDb.getTareManNo());
+                netDb.setNetManName(netDb.getTareManName());
+                netDb.setNetTime(netDb.getTareTime());
+                netDb.setCreateTime(netDb.getTareTime());
+                netDb.setCreateManName(netDb.getTareManName());
+            }
             meterWorkCarActualMapper.insert(netDb);
 
             //1b.如果receive_remark是H01，拿到委托单号，拿到上一个洁净编号A
@@ -2047,6 +2081,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         }
         netDb.setUploadFlag("1");
         netDb.setCreateTime(new Date());
+        if(netDb.getGrossTime().compareTo(netDb.getTareTime()) >= 0) {
+            netDb.setNetSpot3No(netDb.getBaseSpot1No());
+            netDb.setNetSpot3Name(netDb.getBaseSpot1Name());
+            netDb.setNetManNo(netDb.getGrossManNo());
+            netDb.setNetManName(netDb.getGrossManName());
+            netDb.setNetTime(netDb.getGrossTime());
+            netDb.setCreateTime(netDb.getGrossTime());
+            netDb.setCreateManName(netDb.getGrossManName());
+        }else {
+            netDb.setNetSpot3No(netDb.getBaseSpot2No());
+            netDb.setNetSpot3Name(netDb.getBaseSpot2Name());
+            netDb.setNetManNo(netDb.getTareManNo());
+            netDb.setNetManName(netDb.getTareManName());
+            netDb.setNetTime(netDb.getTareTime());
+            netDb.setCreateTime(netDb.getTareTime());
+            netDb.setCreateManName(netDb.getTareManName());
+        }
         meterWorkCarActualMapper.insertSelective(netDb);
 
         //7、修改第一次存储的计量数据状态为洁净;预报编号相同时才处理（不是一车联运非互锁式）
@@ -2383,6 +2434,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             netDb.setNetWeight(net);
         }
         netDb.setCreateTime(new Date());
+        if(netDb.getGrossTime().compareTo(netDb.getTareTime()) >= 0) {
+            netDb.setNetSpot3No(netDb.getBaseSpot1No());
+            netDb.setNetSpot3Name(netDb.getBaseSpot1Name());
+            netDb.setNetManNo(netDb.getGrossManNo());
+            netDb.setNetManName(netDb.getGrossManName());
+            netDb.setNetTime(netDb.getGrossTime());
+            netDb.setCreateTime(netDb.getGrossTime());
+            netDb.setCreateManName(netDb.getGrossManName());
+        }else {
+            netDb.setNetSpot3No(netDb.getBaseSpot2No());
+            netDb.setNetSpot3Name(netDb.getBaseSpot2Name());
+            netDb.setNetManNo(netDb.getTareManNo());
+            netDb.setNetManName(netDb.getTareManName());
+            netDb.setNetTime(netDb.getTareTime());
+            netDb.setCreateTime(netDb.getTareTime());
+            netDb.setCreateManName(netDb.getTareManName());
+        }
         meterWorkCarActualMapper.insertSelective(netDb);
 
         //4、修改预报
@@ -2704,6 +2772,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         }
         netDb.setUploadFlag("1");
         netDb.setCreateTime(new Date());
+        if(netDb.getGrossTime().compareTo(netDb.getTareTime()) >= 0) {
+            netDb.setNetSpot3No(netDb.getBaseSpot1No());
+            netDb.setNetSpot3Name(netDb.getBaseSpot1Name());
+            netDb.setNetManNo(netDb.getGrossManNo());
+            netDb.setNetManName(netDb.getGrossManName());
+            netDb.setNetTime(netDb.getGrossTime());
+            netDb.setCreateTime(netDb.getGrossTime());
+            netDb.setCreateManName(netDb.getGrossManName());
+        }else {
+            netDb.setNetSpot3No(netDb.getBaseSpot2No());
+            netDb.setNetSpot3Name(netDb.getBaseSpot2Name());
+            netDb.setNetManNo(netDb.getTareManNo());
+            netDb.setNetManName(netDb.getTareManName());
+            netDb.setNetTime(netDb.getTareTime());
+            netDb.setCreateTime(netDb.getTareTime());
+            netDb.setCreateManName(netDb.getTareManName());
+        }
         meterWorkCarActualMapper.insertSelective(netDb);
 
         //7、修改第一次存储的计量数据状态为洁净;预报编号相同时才处理（不是一车联运非互锁式）
@@ -2810,6 +2895,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             netDb1.setNetWeight(net);
         }
         netDb1.setCreateTime(new Date());
+        if(netDb1.getGrossTime().compareTo(netDb1.getTareTime()) >= 0) {
+            netDb1.setNetSpot3No(netDb1.getBaseSpot1No());
+            netDb1.setNetSpot3Name(netDb1.getBaseSpot1Name());
+            netDb1.setNetManNo(netDb1.getGrossManNo());
+            netDb1.setNetManName(netDb1.getGrossManName());
+            netDb1.setNetTime(netDb1.getGrossTime());
+            netDb1.setCreateTime(netDb1.getGrossTime());
+            netDb1.setCreateManName(netDb1.getGrossManName());
+        }else {
+            netDb1.setNetSpot3No(netDb1.getBaseSpot2No());
+            netDb1.setNetSpot3Name(netDb1.getBaseSpot2Name());
+            netDb1.setNetManNo(netDb1.getTareManNo());
+            netDb1.setNetManName(netDb1.getTareManName());
+            netDb1.setNetTime(netDb1.getTareTime());
+            netDb1.setCreateTime(netDb1.getTareTime());
+            netDb1.setCreateManName(netDb1.getTareManName());
+        }
         meterWorkCarActualMapper.insertSelective(netDb1);
 
 
@@ -2942,6 +3044,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
         //3、存储数据到洁净表
         netDB.setCreateTime(new Date());
+        if(netDB.getGrossTime().compareTo(netDB.getTareTime()) >= 0) {
+            netDB.setNetSpot3No(netDB.getBaseSpot1No());
+            netDB.setNetSpot3Name(netDB.getBaseSpot1Name());
+            netDB.setNetManNo(netDB.getGrossManNo());
+            netDB.setNetManName(netDB.getGrossManName());
+            netDB.setNetTime(netDB.getGrossTime());
+            netDB.setCreateTime(netDB.getGrossTime());
+            netDB.setCreateManName(netDB.getGrossManName());
+        }else {
+            netDB.setNetSpot3No(netDB.getBaseSpot2No());
+            netDB.setNetSpot3Name(netDB.getBaseSpot2Name());
+            netDB.setNetManNo(netDB.getTareManNo());
+            netDB.setNetManName(netDB.getTareManName());
+            netDB.setNetTime(netDB.getTareTime());
+            netDB.setCreateTime(netDB.getTareTime());
+            netDB.setCreateManName(netDB.getTareManName());
+        }
         meterWorkCarActualMapper.insert(netDB);
 
         //4、根据车号加预报编号修改 craneActualMapper
@@ -3072,7 +3191,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 actualRow.setPredictionNo(scale.getPredictionNo());
                 actualRow.setPredictionType("7");
                 actualRow.setNetWeight(first02.getMeterWeight().subtract(model02.getMeterWeight()));
-
+                if(actualRow.getGrossTime().compareTo(actualRow.getTareTime()) >= 0) {
+                    actualRow.setNetSpot3No(actualRow.getBaseSpot1No());
+                    actualRow.setNetSpot3Name(actualRow.getBaseSpot1Name());
+                    actualRow.setNetManNo(actualRow.getGrossManNo());
+                    actualRow.setNetManName(actualRow.getGrossManName());
+                    actualRow.setNetTime(actualRow.getGrossTime());
+                    actualRow.setCreateTime(actualRow.getGrossTime());
+                    actualRow.setCreateManName(actualRow.getGrossManName());
+                }else {
+                    actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
+                    actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
+                    actualRow.setNetManNo(actualRow.getTareManNo());
+                    actualRow.setNetManName(actualRow.getTareManName());
+                    actualRow.setNetTime(actualRow.getTareTime());
+                    actualRow.setCreateTime(actualRow.getTareTime());
+                    actualRow.setCreateManName(actualRow.getTareManName());
+                }
                 meterWorkCarActualMapper.insertSelective(actualRow);
 
                 //修改委托编号
@@ -3142,6 +3277,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 actualRow.setPredictionNo(scale.getPredictionNo());
                 actualRow.setPredictionType("6");
                 actualRow.setNetWeight(model01.getMeterWeight().subtract(first02.getMeterWeight()));
+                if(actualRow.getGrossTime().compareTo(actualRow.getTareTime()) >= 0) {
+                    actualRow.setNetSpot3No(actualRow.getBaseSpot1No());
+                    actualRow.setNetSpot3Name(actualRow.getBaseSpot1Name());
+                    actualRow.setNetManNo(actualRow.getGrossManNo());
+                    actualRow.setNetManName(actualRow.getGrossManName());
+                    actualRow.setNetTime(actualRow.getGrossTime());
+                    actualRow.setCreateTime(actualRow.getGrossTime());
+                    actualRow.setCreateManName(actualRow.getGrossManName());
+                }else {
+                    actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
+                    actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
+                    actualRow.setNetManNo(actualRow.getTareManNo());
+                    actualRow.setNetManName(actualRow.getTareManName());
+                    actualRow.setNetTime(actualRow.getTareTime());
+                    actualRow.setCreateTime(actualRow.getTareTime());
+                    actualRow.setCreateManName(actualRow.getTareManName());
+                }
                 meterWorkCarActualMapper.insertSelective(actualRow);
 
                 //修改委托编号
@@ -3359,6 +3511,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow1.setPredictionType("5");
             actualRow1.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
             actualRow1.setNetWeight(model01.getMeterWeight().subtract(model02.getMeterWeight()));
+            if(actualRow1.getGrossTime().compareTo(actualRow1.getTareTime()) >= 0) {
+                actualRow1.setNetSpot3No(actualRow1.getBaseSpot1No());
+                actualRow1.setNetSpot3Name(actualRow1.getBaseSpot1Name());
+                actualRow1.setNetManNo(actualRow1.getGrossManNo());
+                actualRow1.setNetManName(actualRow1.getGrossManName());
+                actualRow1.setNetTime(actualRow1.getGrossTime());
+                actualRow1.setCreateTime(actualRow1.getGrossTime());
+                actualRow1.setCreateManName(actualRow1.getGrossManName());
+            }else {
+                actualRow1.setNetSpot3No(actualRow1.getBaseSpot2No());
+                actualRow1.setNetSpot3Name(actualRow1.getBaseSpot2Name());
+                actualRow1.setNetManNo(actualRow1.getTareManNo());
+                actualRow1.setNetManName(actualRow1.getTareManName());
+                actualRow1.setNetTime(actualRow1.getTareTime());
+                actualRow1.setCreateTime(actualRow1.getTareTime());
+                actualRow1.setCreateManName(actualRow1.getTareManName());
+            }
             meterWorkCarActualMapper.insertSelective(actualRow1);
 
 //            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
@@ -3385,6 +3554,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow2.setPredictionType("5");
             actualRow2.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
             actualRow2.setNetWeight(model03.getMeterWeight().subtract(model04.getMeterWeight()));
+            if(actualRow2.getGrossTime().compareTo(actualRow2.getTareTime()) >= 0) {
+                actualRow2.setNetSpot3No(actualRow2.getBaseSpot1No());
+                actualRow2.setNetSpot3Name(actualRow2.getBaseSpot1Name());
+                actualRow2.setNetManNo(actualRow2.getGrossManNo());
+                actualRow2.setNetManName(actualRow2.getGrossManName());
+                actualRow2.setNetTime(actualRow2.getGrossTime());
+                actualRow2.setCreateTime(actualRow2.getGrossTime());
+                actualRow2.setCreateManName(actualRow2.getGrossManName());
+            }else {
+                actualRow2.setNetSpot3No(actualRow2.getBaseSpot2No());
+                actualRow2.setNetSpot3Name(actualRow2.getBaseSpot2Name());
+                actualRow2.setNetManNo(actualRow2.getTareManNo());
+                actualRow2.setNetManName(actualRow2.getTareManName());
+                actualRow2.setNetTime(actualRow2.getTareTime());
+                actualRow2.setCreateTime(actualRow2.getTareTime());
+                actualRow2.setCreateManName(actualRow2.getTareManName());
+            }
             meterWorkCarActualMapper.insertSelective(actualRow2);
 
 
@@ -3577,6 +3763,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             actualRow1.setPredictionNo(predictionNo1);
             actualRow1.setNetWeight(mwcaf2.getMeterWeight().subtract(mwcaf1.getMeterWeight()));
+            if(actualRow1.getGrossTime().compareTo(actualRow1.getTareTime()) >= 0) {
+                actualRow1.setNetSpot3No(actualRow1.getBaseSpot1No());
+                actualRow1.setNetSpot3Name(actualRow1.getBaseSpot1Name());
+                actualRow1.setNetManNo(actualRow1.getGrossManNo());
+                actualRow1.setNetManName(actualRow1.getGrossManName());
+                actualRow1.setNetTime(actualRow1.getGrossTime());
+                actualRow1.setCreateTime(actualRow1.getGrossTime());
+                actualRow1.setCreateManName(actualRow1.getGrossManName());
+            }else {
+                actualRow1.setNetSpot3No(actualRow1.getBaseSpot2No());
+                actualRow1.setNetSpot3Name(actualRow1.getBaseSpot2Name());
+                actualRow1.setNetManNo(actualRow1.getTareManNo());
+                actualRow1.setNetManName(actualRow1.getTareManName());
+                actualRow1.setNetTime(actualRow1.getTareTime());
+                actualRow1.setCreateTime(actualRow1.getTareTime());
+                actualRow1.setCreateManName(actualRow1.getTareManName());
+            }
             meterWorkCarActualMapper.insertSelective(actualRow1);
 
 //            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
@@ -3597,6 +3800,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow2.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             actualRow2.setPredictionNo(predictionNo2);
             actualRow2.setNetWeight(mwcaf4.getMeterWeight().subtract(mwcaf3.getMeterWeight()));
+            if(actualRow2.getGrossTime().compareTo(actualRow2.getTareTime()) >= 0) {
+                actualRow2.setNetSpot3No(actualRow2.getBaseSpot1No());
+                actualRow2.setNetSpot3Name(actualRow2.getBaseSpot1Name());
+                actualRow2.setNetManNo(actualRow2.getGrossManNo());
+                actualRow2.setNetManName(actualRow2.getGrossManName());
+                actualRow2.setNetTime(actualRow2.getGrossTime());
+                actualRow2.setCreateTime(actualRow2.getGrossTime());
+                actualRow2.setCreateManName(actualRow2.getGrossManName());
+            }else {
+                actualRow2.setNetSpot3No(actualRow2.getBaseSpot2No());
+                actualRow2.setNetSpot3Name(actualRow2.getBaseSpot2Name());
+                actualRow2.setNetManNo(actualRow2.getTareManNo());
+                actualRow2.setNetManName(actualRow2.getTareManName());
+                actualRow2.setNetTime(actualRow2.getTareTime());
+                actualRow2.setCreateTime(actualRow2.getTareTime());
+                actualRow2.setCreateManName(actualRow2.getTareManName());
+            }
             meterWorkCarActualMapper.insertSelective(actualRow2);
 
             //更新预报数据
@@ -3770,6 +3990,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             actualRow1.setPredictionNo(predictionNo1);
             actualRow1.setNetWeight(mwcaf1.getMeterWeight().subtract(mwcaf2.getMeterWeight()));
+            if(actualRow1.getGrossTime().compareTo(actualRow1.getTareTime()) >= 0) {
+                actualRow1.setNetSpot3No(actualRow1.getBaseSpot1No());
+                actualRow1.setNetSpot3Name(actualRow1.getBaseSpot1Name());
+                actualRow1.setNetManNo(actualRow1.getGrossManNo());
+                actualRow1.setNetManName(actualRow1.getGrossManName());
+                actualRow1.setNetTime(actualRow1.getGrossTime());
+                actualRow1.setCreateTime(actualRow1.getGrossTime());
+                actualRow1.setCreateManName(actualRow1.getGrossManName());
+            }else {
+                actualRow1.setNetSpot3No(actualRow1.getBaseSpot2No());
+                actualRow1.setNetSpot3Name(actualRow1.getBaseSpot2Name());
+                actualRow1.setNetManNo(actualRow1.getTareManNo());
+                actualRow1.setNetManName(actualRow1.getTareManName());
+                actualRow1.setNetTime(actualRow1.getTareTime());
+                actualRow1.setCreateTime(actualRow1.getTareTime());
+                actualRow1.setCreateManName(actualRow1.getTareManName());
+            }
             meterWorkCarActualMapper.insertSelective(actualRow1);
 //            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
 //            actualRow2.setActualNo(sdf.format(new Date()) + no1);
@@ -3789,6 +4026,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow2.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             actualRow2.setPredictionNo(predictionNo2);
             actualRow2.setNetWeight(mwcaf3.getMeterWeight().subtract(mwcaf4.getMeterWeight()));
+            if(actualRow2.getGrossTime().compareTo(actualRow2.getTareTime()) >= 0) {
+                actualRow2.setNetSpot3No(actualRow2.getBaseSpot1No());
+                actualRow2.setNetSpot3Name(actualRow2.getBaseSpot1Name());
+                actualRow2.setNetManNo(actualRow2.getGrossManNo());
+                actualRow2.setNetManName(actualRow2.getGrossManName());
+                actualRow2.setNetTime(actualRow2.getGrossTime());
+                actualRow2.setCreateTime(actualRow2.getGrossTime());
+                actualRow2.setCreateManName(actualRow2.getGrossManName());
+            }else {
+                actualRow2.setNetSpot3No(actualRow2.getBaseSpot2No());
+                actualRow2.setNetSpot3Name(actualRow2.getBaseSpot2Name());
+                actualRow2.setNetManNo(actualRow2.getTareManNo());
+                actualRow2.setNetManName(actualRow2.getTareManName());
+                actualRow2.setNetTime(actualRow2.getTareTime());
+                actualRow2.setCreateTime(actualRow2.getTareTime());
+                actualRow2.setCreateManName(actualRow2.getTareManName());
+            }
             meterWorkCarActualMapper.insertSelective(actualRow2);
 
             //更新预报数据
@@ -3988,6 +4242,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             actualRow1.setNetWeight(mwcaf01.getMeterWeight().subtract(mwcaf02.getMeterWeight()));
             actualRow1.setCreateTime(new Date());
+            if(actualRow1.getGrossTime().compareTo(actualRow1.getTareTime()) >= 0) {
+                actualRow1.setNetSpot3No(actualRow1.getBaseSpot1No());
+                actualRow1.setNetSpot3Name(actualRow1.getBaseSpot1Name());
+                actualRow1.setNetManNo(actualRow1.getGrossManNo());
+                actualRow1.setNetManName(actualRow1.getGrossManName());
+                actualRow1.setNetTime(actualRow1.getGrossTime());
+                actualRow1.setCreateTime(actualRow1.getGrossTime());
+                actualRow1.setCreateManName(actualRow1.getGrossManName());
+            }else {
+                actualRow1.setNetSpot3No(actualRow1.getBaseSpot2No());
+                actualRow1.setNetSpot3Name(actualRow1.getBaseSpot2Name());
+                actualRow1.setNetManNo(actualRow1.getTareManNo());
+                actualRow1.setNetManName(actualRow1.getTareManName());
+                actualRow1.setNetTime(actualRow1.getTareTime());
+                actualRow1.setCreateTime(actualRow1.getTareTime());
+                actualRow1.setCreateManName(actualRow1.getTareManName());
+            }
             meterWorkCarActualMapper.insertSelective(actualRow1);
 
 //            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
@@ -4006,6 +4277,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow2.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             actualRow2.setNetWeight(mwcaf03.getMeterWeight().subtract(mwcaf04.getMeterWeight()));
             actualRow2.setCreateTime(new Date());
+            if(actualRow2.getGrossTime().compareTo(actualRow2.getTareTime()) >= 0) {
+                actualRow2.setNetSpot3No(actualRow2.getBaseSpot1No());
+                actualRow2.setNetSpot3Name(actualRow2.getBaseSpot1Name());
+                actualRow2.setNetManNo(actualRow2.getGrossManNo());
+                actualRow2.setNetManName(actualRow2.getGrossManName());
+                actualRow2.setNetTime(actualRow2.getGrossTime());
+                actualRow2.setCreateTime(actualRow2.getGrossTime());
+                actualRow2.setCreateManName(actualRow2.getGrossManName());
+            }else {
+                actualRow2.setNetSpot3No(actualRow2.getBaseSpot2No());
+                actualRow2.setNetSpot3Name(actualRow2.getBaseSpot2Name());
+                actualRow2.setNetManNo(actualRow2.getTareManNo());
+                actualRow2.setNetManName(actualRow2.getTareManName());
+                actualRow2.setNetTime(actualRow2.getTareTime());
+                actualRow2.setCreateTime(actualRow2.getTareTime());
+                actualRow2.setCreateManName(actualRow2.getTareManName());
+            }
             meterWorkCarActualMapper.insertSelective(actualRow2);
 
             //更新预报数据
@@ -4090,6 +4378,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             netDb.setUploadFlag("1");
             netDb.setActualFirst1No(secondDb.getActualFirstNo());
             netDb.setCreateTime(new Date());
+            if(netDb.getGrossTime().compareTo(netDb.getTareTime()) >= 0) {
+                netDb.setNetSpot3No(netDb.getBaseSpot1No());
+                netDb.setNetSpot3Name(netDb.getBaseSpot1Name());
+                netDb.setNetManNo(netDb.getGrossManNo());
+                netDb.setNetManName(netDb.getGrossManName());
+                netDb.setNetTime(netDb.getGrossTime());
+                netDb.setCreateTime(netDb.getGrossTime());
+                netDb.setCreateManName(netDb.getGrossManName());
+            }else {
+                netDb.setNetSpot3No(netDb.getBaseSpot2No());
+                netDb.setNetSpot3Name(netDb.getBaseSpot2Name());
+                netDb.setNetManNo(netDb.getTareManNo());
+                netDb.setNetManName(netDb.getTareManName());
+                netDb.setNetTime(netDb.getTareTime());
+                netDb.setCreateTime(netDb.getTareTime());
+                netDb.setCreateManName(netDb.getTareManName());
+            }
             meterWorkCarActualMapper.insert(netDb);
 
             //4、将期限皮重转化为一条皮重计量数据保存
@@ -4336,6 +4641,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualModel.setValueFlag("1");
             actualModel.setNetWeight(meterWeight);
             actualModel.setCreateTime(new Date());
+            if(actualModel.getGrossTime().compareTo(actualModel.getTareTime()) >= 0) {
+                actualModel.setNetSpot3No(actualModel.getBaseSpot1No());
+                actualModel.setNetSpot3Name(actualModel.getBaseSpot1Name());
+                actualModel.setNetManNo(actualModel.getGrossManNo());
+                actualModel.setNetManName(actualModel.getGrossManName());
+                actualModel.setNetTime(actualModel.getGrossTime());
+                actualModel.setCreateTime(actualModel.getGrossTime());
+                actualModel.setCreateManName(actualModel.getGrossManName());
+            }else {
+                actualModel.setNetSpot3No(actualModel.getBaseSpot2No());
+                actualModel.setNetSpot3Name(actualModel.getBaseSpot2Name());
+                actualModel.setNetManNo(actualModel.getTareManNo());
+                actualModel.setNetManName(actualModel.getTareManName());
+                actualModel.setNetTime(actualModel.getTareTime());
+                actualModel.setCreateTime(actualModel.getTareTime());
+                actualModel.setCreateManName(actualModel.getTareManName());
+            }
             meterWorkCarActualMapper.insertSelective(actualModel);
 
             rm.setSucceed();
@@ -4449,6 +4771,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 meterWorkCarActual.setValueFlag("1");
                 meterWorkCarActual.setNetWeight(model.getMeterWeight().subtract(actualFirst.getMeterWeight()));
                 meterWorkCarActual.setCreateTime(new Date());
+                if(meterWorkCarActual.getGrossTime().compareTo(meterWorkCarActual.getTareTime()) >= 0) {
+                    meterWorkCarActual.setNetSpot3No(meterWorkCarActual.getBaseSpot1No());
+                    meterWorkCarActual.setNetSpot3Name(meterWorkCarActual.getBaseSpot1Name());
+                    meterWorkCarActual.setNetManNo(meterWorkCarActual.getGrossManNo());
+                    meterWorkCarActual.setNetManName(meterWorkCarActual.getGrossManName());
+                    meterWorkCarActual.setNetTime(meterWorkCarActual.getGrossTime());
+                    meterWorkCarActual.setCreateTime(meterWorkCarActual.getGrossTime());
+                    meterWorkCarActual.setCreateManName(meterWorkCarActual.getGrossManName());
+                }else {
+                    meterWorkCarActual.setNetSpot3No(meterWorkCarActual.getBaseSpot2No());
+                    meterWorkCarActual.setNetSpot3Name(meterWorkCarActual.getBaseSpot2Name());
+                    meterWorkCarActual.setNetManNo(meterWorkCarActual.getTareManNo());
+                    meterWorkCarActual.setNetManName(meterWorkCarActual.getTareManName());
+                    meterWorkCarActual.setNetTime(meterWorkCarActual.getTareTime());
+                    meterWorkCarActual.setCreateTime(meterWorkCarActual.getTareTime());
+                    meterWorkCarActual.setCreateManName(meterWorkCarActual.getTareManName());
+                }
                 meterWorkCarActualMapper.insertSelective(meterWorkCarActual);
 
                 PreTrackScale preTrackScale = new PreTrackScale();
@@ -4549,6 +4888,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             }
             netDb.setUploadFlag("1");
             netDb.setCreateTime(new Date());
+            if(netDb.getGrossTime().compareTo(netDb.getTareTime()) >= 0) {
+                netDb.setNetSpot3No(netDb.getBaseSpot1No());
+                netDb.setNetSpot3Name(netDb.getBaseSpot1Name());
+                netDb.setNetManNo(netDb.getGrossManNo());
+                netDb.setNetManName(netDb.getGrossManName());
+                netDb.setNetTime(netDb.getGrossTime());
+                netDb.setCreateTime(netDb.getGrossTime());
+                netDb.setCreateManName(netDb.getGrossManName());
+            }else {
+                netDb.setNetSpot3No(netDb.getBaseSpot2No());
+                netDb.setNetSpot3Name(netDb.getBaseSpot2Name());
+                netDb.setNetManNo(netDb.getTareManNo());
+                netDb.setNetManName(netDb.getTareManName());
+                netDb.setNetTime(netDb.getTareTime());
+                netDb.setCreateTime(netDb.getTareTime());
+                netDb.setCreateManName(netDb.getTareManName());
+            }
             meterWorkCarActualMapper.insert(netDb);
 
             //4、如果为期限皮重，则将期限皮重转化为一条皮重计量数据保存
@@ -4652,6 +5008,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         rm.setFailed();
 
         try {
+            String returnNo = "";
             MeterWorkCarActual model = new MeterWorkCarActual();
             if (com.steerinfo.util.StringUtils.isNotEmpty(scale.getPredictionNo())) {
                 MeterWorkCarActualFirst mg = meterWorkCarActualFirstMapper.selectByPrimaryKey(grossModel.getActualFirstNo());
@@ -4665,6 +5022,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     grossModel.setValueFlag("2");//洁净
                     grossModel.setCreateTime(new Date());
                     meterWorkCarActualFirstMapper.insertSelective(grossModel);
+                    returnNo = grossModel.getActualFirstNo();
                 }
                 else {
                     SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
@@ -4676,6 +5034,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     tareModel.setValueFlag("2");//洁净
                     tareModel.setCreateTime(new Date());
                     meterWorkCarActualFirstMapper.insertSelective(tareModel);
+                    returnNo = tareModel.getActualFirstNo();
                 }
 
 
@@ -4726,6 +5085,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 model.setPredictionNo(scale.getPredictionNo());
                 model.setPredictionType("1");
                 model.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
+                if(model.getGrossTime().compareTo(model.getTareTime()) >= 0) {
+                    model.setNetSpot3No(model.getBaseSpot1No());
+                    model.setNetSpot3Name(model.getBaseSpot1Name());
+                    model.setNetManNo(model.getGrossManNo());
+                    model.setNetManName(model.getGrossManName());
+                    model.setNetTime(model.getGrossTime());
+                    model.setCreateTime(model.getGrossTime());
+                    model.setCreateManName(model.getGrossManName());
+                }else {
+                    model.setNetSpot3No(model.getBaseSpot2No());
+                    model.setNetSpot3Name(model.getBaseSpot2Name());
+                    model.setNetManNo(model.getTareManNo());
+                    model.setNetManName(model.getTareManName());
+                    model.setNetTime(model.getTareTime());
+                    model.setCreateTime(model.getTareTime());
+                    model.setCreateManName(model.getTareManName());
+                }
                 meterWorkCarActualMapper.insertSelective(model);
 
                 //更新委托信息状态
@@ -4832,11 +5208,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             //作废一次计量皮重信息
             tareModel.setValueFlag("0");
             meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(tareModel);
-
             rm.setSucceed();
             rm.setCode("200");
             rm.setMessage("操作成功！！");
-            rm.setData(grossModel.getActualFirstNo());
+            rm.setData(returnNo);
             return rm;
         } catch (Exception e) {
             e.printStackTrace();
@@ -4970,16 +5345,22 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     actualRow.setPredictionType("1");
                     actualRow.setNote("期限皮匹配洁净");
                     actualRow.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
-                    if(grossModel.getCreateTime().compareTo(tareModel.getCreateTime()) >= 0) {
-                        actualRow.setNetSpot3No(grossModel.getBaseSpotNo());
-                        actualRow.setNetSpot3Name(grossModel.getBaseSpotName());
-                        actualRow.setNetTime(grossModel.getCreateTime());
-                        actualRow.setCreateTime(grossModel.getCreateTime());
+                    if(actualRow.getGrossTime().compareTo(actualRow.getTareTime()) >= 0) {
+                        actualRow.setNetSpot3No(actualRow.getBaseSpot1No());
+                        actualRow.setNetSpot3Name(actualRow.getBaseSpot1Name());
+                        actualRow.setNetManNo(actualRow.getGrossManNo());
+                        actualRow.setNetManName(actualRow.getGrossManName());
+                        actualRow.setNetTime(actualRow.getGrossTime());
+                        actualRow.setCreateTime(actualRow.getGrossTime());
+                        actualRow.setCreateManName(actualRow.getGrossManName());
                     }else {
-                        actualRow.setNetSpot3No(tareModel.getBaseSpotNo());
-                        actualRow.setNetSpot3Name(tareModel.getBaseSpotName());
-                        actualRow.setNetTime(tareModel.getCreateTime());
-                        actualRow.setCreateTime(tareModel.getCreateTime());
+                        actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
+                        actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
+                        actualRow.setNetManNo(actualRow.getTareManNo());
+                        actualRow.setNetManName(actualRow.getTareManName());
+                        actualRow.setNetTime(actualRow.getTareTime());
+                        actualRow.setCreateTime(actualRow.getTareTime());
+                        actualRow.setCreateManName(actualRow.getTareManName());
                     }
                     meterWorkCarActualMapper.insertSelective(actualRow);
 
@@ -5038,16 +5419,22 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     actualRow.setValueFlag("1");
                     actualRow.setNote("期限皮匹配洁净");
                     actualRow.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
-                    if(grossModel.getCreateTime().compareTo(tareModel.getCreateTime()) >= 0) {
-                        actualRow.setNetSpot3No(grossModel.getBaseSpotNo());
-                        actualRow.setNetSpot3Name(grossModel.getBaseSpotName());
-                        actualRow.setNetTime(grossModel.getCreateTime());
-                        actualRow.setCreateTime(grossModel.getCreateTime());
+                    if(actualRow.getGrossTime().compareTo(actualRow.getTareTime()) >= 0) {
+                        actualRow.setNetSpot3No(actualRow.getBaseSpot1No());
+                        actualRow.setNetSpot3Name(actualRow.getBaseSpot1Name());
+                        actualRow.setNetManNo(actualRow.getGrossManNo());
+                        actualRow.setNetManName(actualRow.getGrossManName());
+                        actualRow.setNetTime(actualRow.getGrossTime());
+                        actualRow.setCreateTime(actualRow.getGrossTime());
+                        actualRow.setCreateManName(actualRow.getGrossManName());
                     }else {
-                        actualRow.setNetSpot3No(tareModel.getBaseSpotNo());
-                        actualRow.setNetSpot3Name(tareModel.getBaseSpotName());
-                        actualRow.setNetTime(tareModel.getCreateTime());
-                        actualRow.setCreateTime(tareModel.getCreateTime());
+                        actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
+                        actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
+                        actualRow.setNetManNo(actualRow.getTareManNo());
+                        actualRow.setNetManName(actualRow.getTareManName());
+                        actualRow.setNetTime(actualRow.getTareTime());
+                        actualRow.setCreateTime(actualRow.getTareTime());
+                        actualRow.setCreateManName(actualRow.getTareManName());
                     }
                     meterWorkCarActualMapper.insertSelective(actualRow);
 
@@ -5184,6 +5571,23 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 mwca.setPredictionType("1");
                 mwca.setNetWeight(model.getMeterWeight().subtract(imTare.getMeterWeight()));
                 mwca.setCreateTime(new Date());
+                if(mwca.getGrossTime().compareTo(mwca.getTareTime()) >= 0) {
+                    mwca.setNetSpot3No(mwca.getBaseSpot1No());
+                    mwca.setNetSpot3Name(mwca.getBaseSpot1Name());
+                    mwca.setNetManNo(mwca.getGrossManNo());
+                    mwca.setNetManName(mwca.getGrossManName());
+                    mwca.setNetTime(mwca.getGrossTime());
+                    mwca.setCreateTime(mwca.getGrossTime());
+                    mwca.setCreateManName(mwca.getGrossManName());
+                }else {
+                    mwca.setNetSpot3No(mwca.getBaseSpot2No());
+                    mwca.setNetSpot3Name(mwca.getBaseSpot2Name());
+                    mwca.setNetManNo(mwca.getTareManNo());
+                    mwca.setNetManName(mwca.getTareManName());
+                    mwca.setNetTime(mwca.getTareTime());
+                    mwca.setCreateTime(mwca.getTareTime());
+                    mwca.setCreateManName(mwca.getTareManName());
+                }
                 meterWorkCarActualMapper.insertSelective(mwca);
 
                 //修改委托

src/main/java/com/steerinfo/meterwork/meterworkcomparespotscale/controller/MeterWorkCompareSpotScaleController.java

@@ -3,6 +3,8 @@ package com.steerinfo.meterwork.meterworkcomparespotscale.controller;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.base.StringUtils;
+import com.steerinfo.framework.utils.base.annotation.NotNull;
 import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.meterwork.meterworkcomparespot.model.MeterWorkCompareSpot;
 import com.steerinfo.meterwork.meterworkcomparespot.service.IMeterWorkCompareSpotService;
@@ -354,4 +356,32 @@ public class MeterWorkCompareSpotScaleController extends BaseRESTfulController {
         List<MeterWorkCompareSpotScale> allScaleNo = meterWorkCompareSpotScaleService.getAllScaleNo();
         return success(allScaleNo,"查询成功");
     }
+
+    @ApiOperation(value = "强制取消预约",notes = "通过预约号将未完成的预约强制取消")
+    @PostMapping(value = "/cancelByScaleNo")
+    public RESTfulResult cancelByScaleNo(@RequestBody MeterWorkCompareSpotScale model){
+        String scaleNo = model.getCompareSpotScaleId();
+        if(StringUtils.isEmpty(scaleNo)) {
+            return failed(null,"预约编号为空，不允许操作");
+        }
+        //通过主键查询相应预约
+        //按理来说 主键 与 预约 一一对应 不会存在两个
+        MeterWorkCompareSpotScale scale = meterWorkCompareSpotScaleService.queryByProperty("compareSpotScaleId", scaleNo).get(0);
+        if (scale == null){
+            return failed(null,"未查询到该预约");
+        }
+
+        //状态 1 -> 未完成
+        //状态 2 -> 完成
+        if ("1".equals(scale.getValueFlag())){ //如果该预约 显示的状态是 未完成 状态
+            //将该预约修改成 已完成 状态
+            //不会修改使用的次数，保持原有次数，只修改状态
+            scale.setValueFlag("2");
+            meterWorkCompareSpotScaleService.updateByPrimaryKey(scale);
+        }else{
+            return failed(null,"该预约已使用完");
+        }
+
+        return success("强制取消成功");
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkcomparespotscale/mapper/MeterWorkCompareSpotScaleMapper.xml

@@ -374,7 +374,7 @@
   </select>
   
   <select id="getAllScaleNo" resultMap="BaseResultMap">
-    SELECT * FROM METER_WORK_COMPARE_SPOT_SCALE WHERE (CREATE_TIME BETWEEN SYSDATE-1 AND SYSDATE) AND VALUE_FLAG != 0 ORDER BY CREATE_TIME DESC
+    SELECT * FROM METER_WORK_COMPARE_SPOT_SCALE WHERE (CREATE_TIME BETWEEN SYSDATE-1 AND sysdate+(1/24*6)) AND VALUE_FLAG != 0 ORDER BY CREATE_TIME DESC
   </select>
-  
+
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkcomparespotscale/service/IMeterWorkCompareSpotScaleService.java

@@ -41,4 +41,6 @@ public interface IMeterWorkCompareSpotScaleService extends IBaseService<MeterWor
     void creatSpotAndScale(MeterWorkCompareSpot spot, MeterWorkCompareSpotScale scale);
 
     List<MeterWorkCompareSpotScale> getAllScaleNo();
+
+    void updateByPrimaryKey(MeterWorkCompareSpotScale scale);
 }

src/main/java/com/steerinfo/meterwork/meterworkcomparespotscale/service/impl/MeterWorkCompareSpotScaleServiceImpl.java

@@ -66,5 +66,10 @@ public class MeterWorkCompareSpotScaleServiceImpl extends BaseServiceImpl<MeterW
        return meterWorkCompareSpotScaleMapper.getAllScaleNo();
     }
 
+    @Override
+    public void updateByPrimaryKey(MeterWorkCompareSpotScale scale) {
+        meterWorkCompareSpotScaleMapper.updateByPrimaryKeySelective(scale);
+    }
+
 
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/impl/MeterWorkRailwayActualServiceImpl.java

@@ -313,6 +313,23 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 throw new MarkerMetException(500, "选中两条一次计量数据中列车车次不一致！！！");
             }
             actualRow.setCreateTime(new Date());
+            if(actualRow.getGrossTime().compareTo(actualRow.getTareTime()) >= 0) {
+                actualRow.setNetSpot3No(actualRow.getBaseSpot1No());
+                actualRow.setNetSpot3Name(actualRow.getBaseSpot1Name());
+                actualRow.setNetManNo(actualRow.getGrossManNo());
+                actualRow.setNetManName(actualRow.getGrossManName());
+                actualRow.setNetTime(actualRow.getGrossTime());
+                actualRow.setCreateTime(actualRow.getGrossTime());
+                actualRow.setCreateManName(actualRow.getGrossManName());
+            }else {
+                actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
+                actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
+                actualRow.setNetManNo(actualRow.getTareManNo());
+                actualRow.setNetManName(actualRow.getTareManName());
+                actualRow.setNetTime(actualRow.getTareTime());
+                actualRow.setCreateTime(actualRow.getTareTime());
+                actualRow.setCreateManName(actualRow.getTareManName());
+            }
             meterWorkRailwayActualMapper.insertSelective(actualRow);
 
             //预报的处理
@@ -404,6 +421,23 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             actualRow.setLcNo(actFirst01.getLcNo());
             actualRow.setNetMode(DbConstants.TYPE);
             actualRow.setNetWeight(actFirst01.getMeterWeight().subtract(actFirst02.getMeterWeight()));
+            if(actualRow.getGrossTime().compareTo(actualRow.getTareTime()) >= 0) {
+                actualRow.setNetSpot3No(actualRow.getBaseSpot1No());
+                actualRow.setNetSpot3Name(actualRow.getBaseSpot1Name());
+                actualRow.setNetManNo(actualRow.getGrossManNo());
+                actualRow.setNetManName(actualRow.getGrossManName());
+                actualRow.setNetTime(actualRow.getGrossTime());
+                actualRow.setCreateTime(actualRow.getGrossTime());
+                actualRow.setCreateManName(actualRow.getGrossManName());
+            }else {
+                actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
+                actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
+                actualRow.setNetManNo(actualRow.getTareManNo());
+                actualRow.setNetManName(actualRow.getTareManName());
+                actualRow.setNetTime(actualRow.getTareTime());
+                actualRow.setCreateTime(actualRow.getTareTime());
+                actualRow.setCreateManName(actualRow.getTareManName());
+            }
             meterWorkRailwayActualMapper.insertSelective(actualRow);
 
             scale.setValueFlag(DbConstants.NET);
@@ -451,6 +485,23 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             actualRow.setNetTime(new Date());
             actualRow.setNetMode(DbConstants.TYPE);
             actualRow.setNetWeight(actFirst01.getMeterWeight().subtract(actFirst02.getMeterWeight()));
+            if(actualRow.getGrossTime().compareTo(actualRow.getTareTime()) >= 0) {
+                actualRow.setNetSpot3No(actualRow.getBaseSpot1No());
+                actualRow.setNetSpot3Name(actualRow.getBaseSpot1Name());
+                actualRow.setNetManNo(actualRow.getGrossManNo());
+                actualRow.setNetManName(actualRow.getGrossManName());
+                actualRow.setNetTime(actualRow.getGrossTime());
+                actualRow.setCreateTime(actualRow.getGrossTime());
+                actualRow.setCreateManName(actualRow.getGrossManName());
+            }else {
+                actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
+                actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
+                actualRow.setNetManNo(actualRow.getTareManNo());
+                actualRow.setNetManName(actualRow.getTareManName());
+                actualRow.setNetTime(actualRow.getTareTime());
+                actualRow.setCreateTime(actualRow.getTareTime());
+                actualRow.setCreateManName(actualRow.getTareManName());
+            }
             meterWorkRailwayActualMapper.insertSelective(actualRow);
         }
         rm.setSucceed();
@@ -605,6 +656,23 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         model.setUploadFlag("1");
 //        model.setNote(); // 添加修改原因记录
         model.setCreateTime(new Date());
+        if(model.getGrossTime().compareTo(model.getTareTime()) >= 0) {
+            model.setNetSpot3No(model.getBaseSpot1No());
+            model.setNetSpot3Name(model.getBaseSpot1Name());
+            model.setNetManNo(model.getGrossManNo());
+            model.setNetManName(model.getGrossManName());
+            model.setNetTime(model.getGrossTime());
+            model.setCreateTime(model.getGrossTime());
+            model.setCreateManName(model.getGrossManName());
+        }else {
+            model.setNetSpot3No(model.getBaseSpot2No());
+            model.setNetSpot3Name(model.getBaseSpot2Name());
+            model.setNetManNo(model.getTareManNo());
+            model.setNetManName(model.getTareManName());
+            model.setNetTime(model.getTareTime());
+            model.setCreateTime(model.getTareTime());
+            model.setCreateManName(model.getTareManName());
+        }
         int num = meterWorkRailwayActualMapper.insertSelective(model);
 
         // 处理预报信息
@@ -1224,6 +1292,23 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             mwca.setNetWeight(mwraf1.getMeterWeight().subtract(mbrw.getRailwayWeight()));
             mwca.setUploadFlag("1");
             mwca.setCreateTime(new Date());
+            if(mwca.getGrossTime().compareTo(mwca.getTareTime()) >= 0) {
+                mwca.setNetSpot3No(mwca.getBaseSpot1No());
+                mwca.setNetSpot3Name(mwca.getBaseSpot1Name());
+                mwca.setNetManNo(mwca.getGrossManNo());
+                mwca.setNetManName(mwca.getGrossManName());
+                mwca.setNetTime(mwca.getGrossTime());
+                mwca.setCreateTime(mwca.getGrossTime());
+                mwca.setCreateManName(mwca.getGrossManName());
+            }else {
+                mwca.setNetSpot3No(mwca.getBaseSpot2No());
+                mwca.setNetSpot3Name(mwca.getBaseSpot2Name());
+                mwca.setNetManNo(mwca.getTareManNo());
+                mwca.setNetManName(mwca.getTareManName());
+                mwca.setNetTime(mwca.getTareTime());
+                mwca.setCreateTime(mwca.getTareTime());
+                mwca.setCreateManName(mwca.getTareManName());
+            }
             meterWorkRailwayActualMapper.insertSelective(mwca);
             return mwca;
         } catch (MarkerMetException e) {
@@ -1846,6 +1931,23 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 model.setIsPreSacale("0");
                 model.setUploadFlag("1");
                 model.setCreateTime(new Date());
+                if(model.getGrossTime().compareTo(model.getTareTime()) >= 0) {
+                    model.setNetSpot3No(model.getBaseSpot1No());
+                    model.setNetSpot3Name(model.getBaseSpot1Name());
+                    model.setNetManNo(model.getGrossManNo());
+                    model.setNetManName(model.getGrossManName());
+                    model.setNetTime(model.getGrossTime());
+                    model.setCreateTime(model.getGrossTime());
+                    model.setCreateManName(model.getGrossManName());
+                }else {
+                    model.setNetSpot3No(model.getBaseSpot2No());
+                    model.setNetSpot3Name(model.getBaseSpot2Name());
+                    model.setNetManNo(model.getTareManNo());
+                    model.setNetManName(model.getTareManName());
+                    model.setNetTime(model.getTareTime());
+                    model.setCreateTime(model.getTareTime());
+                    model.setCreateManName(model.getTareManName());
+                }
                 meterWorkRailwayActualMapper.insertSelective(model);
                 num++;
             }
@@ -1908,6 +2010,23 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 model.setDataSource("4");
                 model.setUploadFlag("1");
                 model.setCreateTime(new Date());
+                if(model.getGrossTime().compareTo(model.getTareTime()) >= 0) {
+                    model.setNetSpot3No(model.getBaseSpot1No());
+                    model.setNetSpot3Name(model.getBaseSpot1Name());
+                    model.setNetManNo(model.getGrossManNo());
+                    model.setNetManName(model.getGrossManName());
+                    model.setNetTime(model.getGrossTime());
+                    model.setCreateTime(model.getGrossTime());
+                    model.setCreateManName(model.getGrossManName());
+                }else {
+                    model.setNetSpot3No(model.getBaseSpot2No());
+                    model.setNetSpot3Name(model.getBaseSpot2Name());
+                    model.setNetManNo(model.getTareManNo());
+                    model.setNetManName(model.getTareManName());
+                    model.setNetTime(model.getTareTime());
+                    model.setCreateTime(model.getTareTime());
+                    model.setCreateManName(model.getTareManName());
+                }
                 meterWorkRailwayActualMapper.insertSelective(model);
 
                 preRailwayScale.setMeasureStation(model.getNetSpot3No());
@@ -2040,6 +2159,23 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             actualRow.setUpdateTime(new Date());
             actualRow.setPredictionNo(predictionNo);
             actualRow.setNetWeight(mwcaf1.getMeterWeight().subtract(mwcaf2.getMeterWeight()));
+            if(actualRow.getGrossTime().compareTo(actualRow.getTareTime()) >= 0) {
+                actualRow.setNetSpot3No(actualRow.getBaseSpot1No());
+                actualRow.setNetSpot3Name(actualRow.getBaseSpot1Name());
+                actualRow.setNetManNo(actualRow.getGrossManNo());
+                actualRow.setNetManName(actualRow.getGrossManName());
+                actualRow.setNetTime(actualRow.getGrossTime());
+                actualRow.setCreateTime(actualRow.getGrossTime());
+                actualRow.setCreateManName(actualRow.getGrossManName());
+            }else {
+                actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
+                actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
+                actualRow.setNetManNo(actualRow.getTareManNo());
+                actualRow.setNetManName(actualRow.getTareManName());
+                actualRow.setNetTime(actualRow.getTareTime());
+                actualRow.setCreateTime(actualRow.getTareTime());
+                actualRow.setCreateManName(actualRow.getTareManName());
+            }
             meterWorkRailwayActualMapper.insertSelective(actualRow);
             rm.setSucceed();
             rm.setMessage("操作成功！！！");