后端修改

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

@@ -693,7 +693,8 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                     throw new MarkerMetException(500, "未查询到相应的毛重数据！！");
                 }
                 // 清空毛重数据中的委托信息
-                MeterWorkCarActualFirst mwcafg = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst1No());
+//                MeterWorkCarActualFirst mwcafg = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst1No());
+                MeterWorkCarActualFirst mwcafg = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst1No());
                 mwcafg.setValueFlag(DbConstants.VALID);
                 mwcafg.setNote(model.getNote());
                 mwcafg.setUpdateManNo(userId);
@@ -710,7 +711,8 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                     throw new MarkerMetException(500, "未查询到相应的皮重数据！！");
                 }
                 if (mwcaf2 != null) {
-                    MeterWorkCarActualFirst mwcaft = meterWorkCarActualFirstMapper.selectAndRemove(mwcaf2.getActualFirstNo());
+//                    MeterWorkCarActualFirst mwcaft = meterWorkCarActualFirstMapper.selectAndRemove(mwcaf2.getActualFirstNo());
+                    MeterWorkCarActualFirst mwcaft = meterWorkCarActualFirstMapper.selectByPrimaryKey(mwcaf2.getActualFirstNo());
                     if ("2".equals(mwcaft.getWeightType())) {
                         mwcaft.setValueFlag(DbConstants.INVALID); //期限皮重置为作废
                         mwcaft.setUpdateManNo(userId);

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

@@ -3504,8 +3504,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             Assert.isTrue(modelTemp != null, "未查询到"+ model.getActualNo() +"对应的结净数据");
             Assert.isTrue(!(modelTemp.getValueFlag().equals("2") && modelTemp.getValueFlag().equals("0")), model.getActualNo() + "对应的结净数据已发布或者已作废,无法匹配委托");
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            if(model.getUpdateTime() != null && StringUtils.isNotEmpty(model.getUpdateTime().toString())) {
-                String sDate = df.format(model.getUpdateTime());
+            if(modelTemp.getUpdateTime() != null && StringUtils.isNotEmpty(modelTemp.getUpdateTime().toString())) {
+                String sDate = df.format(modelTemp.getUpdateTime());
                 String eDate = df.format(new Date());
                 long sTime = df.parse(sDate).getTime();
                 long eTime = df.parse(eDate).getTime();
@@ -3624,8 +3624,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 Assert.isTrue(modelTemp != null, "未查询到"+ model.getActualNo() +"对应的结净数据");
                 Assert.isTrue(!(modelTemp.getValueFlag().equals("2") && modelTemp.getValueFlag().equals("0")), model.getActualNo() + "对应的结净数据已发布或者已作废,无法撤销委托");
                 SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                if(model.getUpdateTime() != null && StringUtils.isNotEmpty(model.getUpdateTime().toString())) {
-                    String sDate = df.format(model.getUpdateTime());
+                if(modelTemp.getUpdateTime() != null && StringUtils.isNotEmpty(modelTemp.getUpdateTime().toString())) {
+                    String sDate = df.format(modelTemp.getUpdateTime());
                     String eDate = df.format(new Date());
                     long sTime = df.parse(sDate).getTime();
                     long eTime = df.parse(eDate).getTime();