后端修改

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

@@ -360,6 +360,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 mwcaf2.setUpdateManName(userName);
                 mwcaf2.setUpdateTime(new Date());
                 mwcaf2.setNote("网页手动计量结净");
+                mwcaf2.setIsPreScale("1");
                 mwcaf2.setPredictionNo(predictionNo);
                 mwcaf2.setPredictionType("1");
                 meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf2);

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

@@ -1197,11 +1197,25 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 //二次重量如果跟皮重一样
                 netDb.setActualFirst2No(secondDb.getActualFirstNo());
                 netDb.setTareTime(secondDb.getCreateTime());
+                netDb.setBaseSpot2No(secondDb.getBaseSpotNo());
+                netDb.setBaseSpot2Name(secondDb.getBaseSpotName());
+                MeterWorkCarActualFirst modelTemp = meterWorkCarActualFirstMapper.selectByPrimaryKey(netDb.getActualFirst1No());
+                if(modelTemp != null) {
+                    netDb.setBaseSpot1No(modelTemp.getBaseSpotNo());
+                    netDb.setBaseSpot1Name(modelTemp.getBaseSpotName());
+                }
                 firstUpdate.setActualFirstNo(netDb.getActualFirst1No());
                 firstUpdate.setWeightType("0");
             } else {
                 netDb.setActualFirst1No(secondDb.getActualFirstNo());
                 netDb.setGrossTime(secondDb.getCreateTime());
+                netDb.setBaseSpot1No(secondDb.getBaseSpotNo());
+                netDb.setBaseSpot1Name(secondDb.getBaseSpotName());
+                MeterWorkCarActualFirst modelTemp = meterWorkCarActualFirstMapper.selectByPrimaryKey(netDb.getActualFirst2No());
+                if(modelTemp != null) {
+                    netDb.setBaseSpot2No(modelTemp.getBaseSpotNo());
+                    netDb.setBaseSpot2Name(modelTemp.getBaseSpotName());
+                }
                 firstUpdate.setActualFirstNo(netDb.getActualFirst2No());
                 firstUpdate.setWeightType("1");
             }