后端修改

.idea/jg_wzjl_api.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirstbak/controller/MeterWorkCarActualFirstBakController.java

@@ -228,6 +228,7 @@ public class MeterWorkCarActualFirstBakController extends BaseRESTfulController
             }
             model.setCreateManNo(userId);
             model.setCreateManName(userName);
+            model.setIsPreScale("0");
             HashMap<String, Object> obj = new HashMap<>();
             obj.put("baseSpotNo", model.getBaseSpotNo());
             List<MeterBaseSpotInfo> spotModel = meterBaseSpotInfoMapper.selectByParameters(obj);

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

@@ -1553,14 +1553,14 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         grossFirst.setIsPreSacale("1");
         grossFirst.setValueFlag("2");
         grossFirst.setPredictionType("5");
-        grossFirst.setNote("双委托洁净");
+        grossFirst.setNote("双委托结净");
 
         MeterWorkRailwayActFirst tareFirstTemp = meterWorkRailwayActFirstMapper.selectAndMatch(tareFirst.getActualFirstNo(), predictionNo);
         BeanUtils.copyProperties(tareFirstTemp, tareFirst);
         tareFirst.setIsPreSacale("1");
         tareFirst.setValueFlag("2");
         tareFirst.setPredictionType("5");
-        tareFirst.setNote("双委托洁净");
+        tareFirst.setNote("双委托结净");
 
         MeterWorkRailwayActual mwca = meterWorkRailwayActualMapper.manualAddPre(grossFirst.getActualFirstNo(), tareFirst.getActualFirstNo(), predictionNo);
         BeanUtils.copyProperties(mwca, actualRow);
@@ -1571,7 +1571,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         actualRow.setValueFlag("1");
         actualRow.setIsPreSacale("1");
         actualRow.setPredictionType("5");
-        actualRow.setNote("双委托洁净");
+        actualRow.setNote("双委托结净");
         actualRow.setNetWeight(grossFirst.getMeterWeight().subtract(tareFirst.getMeterWeight()));
     }
 

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/model/MeterWorkRailwayActual.java

@@ -346,9 +346,9 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
     private String netGroup;
 
     /**
-     * 结净方式（1：正常结净；2：匹配结净；3：双委托洁净；4：混装洁净；5：混卸洁净）(NET_MODE,VARCHAR,1)
+     * 结净方式（1：正常结净；2：匹配结净；3：双委托结净；4：混装结净；5：混卸结净）(NET_MODE,VARCHAR,1)
      */
-    @ApiModelProperty(value="结净方式（1：正常结净；2：匹配结净；3：双委托洁净；4：混装洁净；5：混卸洁净）",required=false)
+    @ApiModelProperty(value="结净方式（1：正常结净；2：匹配结净；3：双委托结净；4：混装结净；5：混卸结净）",required=false)
     private String netMode;
 
     /**

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

@@ -211,7 +211,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         return rm;
     }
 
-    //动态衡作废洁净数据、并恢复从表数据
+    //动态衡作废结净数据、并恢复从表数据
     @Override
     public RESTfulResult deleteList(List<MeterWorkRailwayActual> models) {
         RESTfulResult rm = new RESTfulResult();
@@ -3100,8 +3100,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 Assert.isTrue(model.getPredictionNo() != null && StringUtils.isNotEmpty(model.getPredictionNo()), "委托号不能为空");
                 PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
                 if(scale != null) {
-                    Assert.isTrue(!scale.getValueFlag().equals("2"), "委托信息已使用，不允许补录洁净数据");
-                    Assert.isTrue(!scale.getValueFlag().equals("9"), "委托信息已结算，不允许补录洁净数据");
+                    Assert.isTrue(!scale.getValueFlag().equals("2"), "委托信息已使用，不允许补录结净数据");
+                    Assert.isTrue(!scale.getValueFlag().equals("9"), "委托信息已结算，不允许补录结净数据");
                 }
             }
             int count = 0;
@@ -3261,7 +3261,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
 
             for(MeterWorkRailwayActual model: models) {
                 MeterWorkRailwayActual modelTemp = meterWorkRailwayActualMapper.selectByPrimaryKey(model.getActualNo());
-                Assert.isTrue(!modelTemp.getValueFlag().equals("2"), "选择的洁净数据已发布,请取消发布之后在操作");
+                Assert.isTrue(!modelTemp.getValueFlag().equals("2"), "选择的结净数据已发布,请取消发布之后在操作");
             }
 
             for(MeterWorkRailwayActual model: models) {
@@ -3320,8 +3320,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             }
 
             MeterWorkRailwayActual modelTemp = meterWorkRailwayActualMapper.selectByPrimaryKey(model.getActualNo());
-            Assert.isTrue(modelTemp != null, "未查询到"+ model.getActualNo() +"对应的洁净数据");
-            Assert.isTrue(!(modelTemp.getValueFlag().equals("2") && modelTemp.getValueFlag().equals("0")), model.getActualNo() + "对应的洁净数据已发布或者已作废,无法匹配委托");
+            Assert.isTrue(modelTemp != null, "未查询到"+ model.getActualNo() +"对应的结净数据");
+            Assert.isTrue(!(modelTemp.getValueFlag().equals("2") && modelTemp.getValueFlag().equals("0")), model.getActualNo() + "对应的结净数据已发布或者已作废,无法匹配委托");
             if(modelTemp.getPredictionNo() == null || StringUtils.isEmpty(modelTemp.getPredictionNo())) {
                 PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
                 Assert.isTrue(scale != null, "未找到" + model.getPredictionNo() + "对应的委托信息");
@@ -3369,7 +3369,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 rm.setCode("200");
                 rm.setData(null);
             }else{
-                rm.setMessage("选择的洁净数据已匹配委托");
+                rm.setMessage("选择的结净数据已匹配委托");
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -3399,8 +3399,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             int count = 0;
             for(MeterWorkRailwayActual model:models){
                 MeterWorkRailwayActual modelTemp = meterWorkRailwayActualMapper.selectByPrimaryKey(model.getActualNo());
-                Assert.isTrue(modelTemp != null, "未查询到"+ model.getActualNo() +"对应的洁净数据");
-                Assert.isTrue(!(modelTemp.getValueFlag().equals("2") && modelTemp.getValueFlag().equals("0")), model.getActualNo() + "对应的洁净数据已发布或者已作废,无法撤销委托");
+                Assert.isTrue(modelTemp != null, "未查询到"+ model.getActualNo() +"对应的结净数据");
+                Assert.isTrue(!(modelTemp.getValueFlag().equals("2") && modelTemp.getValueFlag().equals("0")), model.getActualNo() + "对应的结净数据已发布或者已作废,无法撤销委托");
                 if(modelTemp.getPredictionNo() != null && StringUtils.isNotEmpty(modelTemp.getPredictionNo())) {
                     PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(modelTemp.getPredictionNo());
                     Assert.isTrue(scale != null, "未找到" + modelTemp.getPredictionNo() +"对应的委托信息");
@@ -3473,7 +3473,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 userId = "admin";
                 userName = "admin";
             }
-            Assert.isTrue(models.size()>=1, "未选择洁净数据，请重新操作");
+            Assert.isTrue(models.size()>=1, "未选择结净数据，请重新操作");
 
             for (MeterWorkRailwayActual model: models) {
                 MeterWorkRailwayActual modelTemp = meterWorkRailwayActualMapper.selectByPrimaryKey(model.getActualNo());
@@ -3488,7 +3488,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             }
             for (MeterWorkRailwayActual model: models) {
                 MeterWorkRailwayActual modelTemp = meterWorkRailwayActualMapper.selectByPrimaryKey(model.getActualNo());
-                Assert.isTrue(modelTemp != null, "未查询到"+ model.getActualNo() +"对应的洁净数据");
+                Assert.isTrue(modelTemp != null, "未查询到"+ model.getActualNo() +"对应的结净数据");
 
                 MeterWorkRailwayActFirst grossModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(modelTemp.getActualFirst1No());
                 if(grossModel != null) {            //作废毛重数据、并回复从表数据

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/model/MeterWorkRailwayReceived.java

@@ -405,9 +405,9 @@ public class MeterWorkRailwayReceived implements IBasePO<String> {
     private String AiWeight;
 
     /**
-     * 是否自动执行匹配委托、洁净(0:自动执行、1：不自动执行)(IS_AUTO_OPERATION,VARCHAR,1)
+     * 是否自动执行匹配委托、结净(0:自动执行、1：不自动执行)(IS_AUTO_OPERATION,VARCHAR,1)
      */
-    @ApiModelProperty(value="是否自动执行匹配委托、洁净(0:自动执行、1：不自动执行)",required=false)
+    @ApiModelProperty(value="是否自动执行匹配委托、结净(0:自动执行、1：不自动执行)",required=false)
     private String isAutoOperation;
 
     private static final long serialVersionUID = 1L;

src/main/java/com/steerinfo/meterwork/meterworkznlc/service/impl/MeterWorkZnlcService.java

@@ -32,7 +32,7 @@ public class MeterWorkZnlcService implements IMeterWorkZnlcService {
 
     @Override
     public Boolean getNewActual(RESTfulResult rm, HashMap<String, Object> map, HashMap<String, Object> param) {
-        //根据委托号查询洁净数据（新系统）
+        //根据委托号查询结净数据（新系统）
         List<MeterWorkCarActual> actualList = meterWorkCarActualMapper.selectByParameters(map);
         if(actualList.size() >= 1) {
             param.put("DeviceNo", actualList.get(0).getNetSpot3No());    //计量设备号