后端提交

src/main/java/com/steerinfo/baseinfo/meterbasecar/controller/MeterBaseCarController.java

@@ -821,6 +821,9 @@ public class MeterBaseCarController extends BaseRESTfulController {
                 userName = "admins";
             }
 
+            car.setUsetDepartmentNo("");
+            car.setUsetDepartment("");
+
             String msg = "";
             // 检查车辆是否存在
             HashMap query = new HashMap();

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

@@ -603,7 +603,11 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         }
 
                         // 删洁净
-                        meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
+                        model.setUploadFlag("1");
+                        model.setValueFlag("0");
+                        meterWorkCarActualMapper.updateByPrimaryKeySelective(model);
+
+                        //meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
                     }
                     else {
                         // 清空毛重数据中的委托信息
@@ -642,7 +646,10 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                             scale.setUpdateManName("双委托解除操作");
                             preTrackScaleMapper.updateByPrimaryKeySelective(scale);
                         }
-                        meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
+                        model.setUploadFlag("1");
+                        model.setValueFlag("0");
+                        meterWorkCarActualMapper.updateByPrimaryKeySelective(model);
+                        //meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
                     }
                 }
                 rm.setSucceed();
@@ -689,7 +696,10 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                             meterWorkCarActualFirstMapper.updateByPrimaryKey(firstGross);
                         }
                         // 删洁净
-                        meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
+                        model.setUploadFlag("1");
+                        model.setValueFlag("0");
+                        meterWorkCarActualMapper.updateByPrimaryKeySelective(model);
+//                        meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
                     }
                     else {
                         // 清空毛重数据中的委托信息
@@ -728,7 +738,10 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                             scale.setUpdateManName("混卸解除操作");
                             preTrackScaleMapper.updateByPrimaryKeySelective(scale);
                         }
-                        meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
+                        model.setUploadFlag("1");
+                        model.setValueFlag("0");
+                        meterWorkCarActualMapper.updateByPrimaryKeySelective(model);
+//                        meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
                     }
                 }
                 rm.setSucceed();
@@ -775,7 +788,10 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                             meterWorkCarActualFirstMapper.updateByPrimaryKey(firstTare);
                         }
                         // 删洁净
-                        meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
+                        model.setUploadFlag("1");
+                        model.setValueFlag("0");
+                        meterWorkCarActualMapper.updateByPrimaryKeySelective(model);
+//                        meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
                     }
                     else {
                         // 清空毛重数据中的委托信息
@@ -814,7 +830,10 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                             scale.setUpdateManName("混装解除操作");
                             preTrackScaleMapper.updateByPrimaryKeySelective(scale);
                         }
-                        meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
+                        model.setUploadFlag("1");
+                        model.setValueFlag("0");
+                        meterWorkCarActualMapper.updateByPrimaryKeySelective(model);
+//                        meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
                     }
                 }
                 rm.setSucceed();
@@ -862,8 +881,15 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 }
             }
             // 清空一次毛重、皮重委托信息
-            MeterWorkCarActualFirst firstGross = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst1No());
-            MeterWorkCarActualFirst firstTare = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst2No());
+            MeterWorkCarActualFirst firstGross;
+            MeterWorkCarActualFirst firstTare;
+            if(StringUtils.isNotEmpty(model.getActualFirst1No())&&StringUtils.isNotEmpty(model.getActualFirst2No())){
+                firstGross = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst1No());
+                firstTare =  meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst2No());
+            }else{
+                firstGross = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst1No());
+                firstTare = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
+            }
             if(firstGross != null){
                 firstGross.setValueFlag(DbConstants.VALID);
                 firstGross.setUpdateManName("system");
@@ -882,8 +908,12 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 firstTare.setIsPreScale("0");
                 meterWorkCarActualFirstMapper.updateByPrimaryKey(firstTare);
             }
-            // 删洁净
-            meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
+            // 作废洁净
+            model.setUploadFlag("1");
+            model.setValueFlag("0");
+            meterWorkCarActualMapper.updateByPrimaryKeySelective(model);
+            //删洁净
+            //meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
         }
         rm.setSucceed();
         rm.setMessage("操作成功！！");
@@ -1053,12 +1083,14 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             grossrow.setUpdateTime(new Date());
             grossrow.setUpdateManName(userName + ": 洁净数据匹配委托操作");
             grossrow.setUpdateManNo(userId);
+            grossrow.setIsPreScale("1");
             meterWorkCarActualFirstMapper.updateByPrimaryKey(grossrow);
             // 皮重
             MeterWorkCarActualFirst tarerow = meterWorkCarActualFirstMapper.selectAndMatch(model.getActualFirst2No(), predictionNo);
             tarerow.setUpdateTime(new Date());
             tarerow.setUpdateManName(userName + ": 洁净数据匹配委托操作");
             tarerow.setUpdateManNo(userId);
+            tarerow.setIsPreScale("1");
             meterWorkCarActualFirstMapper.updateByPrimaryKey(tarerow);
             // 处理预报
             if (scale != null) {
@@ -1071,6 +1103,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             }
             MeterWorkCarActual mwca = meterWorkCarActualMapper.mathPredcition(actualNo, predictionNo);
             mwca.setIsPreScale("1");
+            mwca.setPredictionType("1");
             mwca.setUploadFlag("1");
             mwca.setNote(note);
             meterWorkCarActualMapper.updateByPrimaryKey(mwca);

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

@@ -53,30 +53,25 @@ import com.steerinfo.meterwork.meterworkrailwayactfirst.mapper.MeterWorkRailwayA
 import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst;
 import com.steerinfo.meterwork.meterworkrailwayactual.mapper.MeterWorkRailwayActualMapper;
 import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
-import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
 import com.steerinfo.pretrack.pretrackscale.mapper.PreTrackScaleMapper;
 import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import com.steerinfo.util.AESUtil;
 import com.steerinfo.util.FieldsCollector;
 import com.steerinfo.util.HttpRequest;
 import com.steerinfo.util.StringUtils;
-import io.micrometer.core.instrument.Meter;
-import oracle.jdbc.proxy.annotation.Pre;
-import org.apache.shiro.crypto.hash.Hash;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
+import java.sql.SQLException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static java.lang.Math.abs;
 
 /**
  * MeterWorkCarActualFirst服务实现：
@@ -2882,7 +2877,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
 
-        try{
+        try {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             String afl = sdf.format(new Date());
 
@@ -2896,12 +2891,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
             MeterWorkCarActual actualRow1 = new MeterWorkCarActual();
             MeterWorkCarActual actualRow2 = new MeterWorkCarActual();
-            if(one.getWeightType().equals("0")){
+            if (one.getWeightType().equals("0")) {
                 //毛重一次
                 model01 = meterWorkCarActualFirstMapper.selectByPrimaryKey(one.getActualFirstNo());
                 //皮重一次
                 model02 = meterWorkCarActualFirstMapper.selectByPrimaryKey(two.getActualFirst2No());
-            }else if(one.getWeightType().equals("1")) {
+            } else if (one.getWeightType().equals("1")) {
                 //毛重一次
                 model01 = meterWorkCarActualFirstMapper.selectByPrimaryKey(two.getActualFirst1No());
                 //皮重一次
@@ -2915,11 +2910,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
             //将委托中的编号和收发货的等数据拷贝进一次数据中
             MeterWorkCarActualFirst first1 = meterWorkCarActualFirstMapper.selectAndMatch(model01.getActualFirstNo(), scale01.getPredictionNo());
-            BeanUtils.copyProperties(first1,model01);
+            BeanUtils.copyProperties(first1, model01);
             MeterWorkCarActualFirst first2 = meterWorkCarActualFirstMapper.selectAndMatch(model02.getActualFirstNo(), scale01.getPredictionNo());
             BeanUtils.copyProperties(first2, model02);
             MeterWorkCarActualFirst first3 = meterWorkCarActualFirstMapper.selectAndMatch(model01.getActualFirstNo(), scale02.getPredictionNo());
-            BeanUtils.copyProperties(first3,model03);
+            BeanUtils.copyProperties(first3, model03);
             MeterWorkCarActualFirst first4 = meterWorkCarActualFirstMapper.selectAndMatch(model02.getActualFirstNo(), scale02.getPredictionNo());
             BeanUtils.copyProperties(first4, model04);
 
@@ -3065,8 +3060,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         }catch(Exception e) {
             e.printStackTrace();
             rm.setMessage("操作异常，请确认！！>>>>" + e.getMessage());
-            return rm;
         }
+        return rm;
     }
 
 

src/main/java/com/steerinfo/meterwork/meterworkimage/controller/MeterWorkImageController.java

@@ -141,6 +141,26 @@ public class MeterWorkImageController extends BaseRESTfulController {
     @ApiOperation(value = "获取图片路径", notes = "获取图片路径")
     @GetMapping(value = "/getUrl")
     public RESTfulResult getUrl(@RequestParam String actualFirstNo) {
+        RESTfulResult rm = failed();
+        try {
+            ArrayList<String> urls = meterWorkImageService.queryRailwayUrl(actualFirstNo);
+            return success(urls);
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setCode("200");
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
+
+    @ApiOperation(value = "获取轨道衡图片路径", notes = "获取轨道衡图片路径")
+    @GetMapping(value = "/getRailwayUrl")
+    public RESTfulResult getRailwayUrl(@RequestParam String actualFirstNo) {
         RESTfulResult rm = failed();
         try {
             ArrayList<String> urls = meterWorkImageService.queryUrl(actualFirstNo);

src/main/java/com/steerinfo/meterwork/meterworkimage/service/IMeterWorkImageService.java

@@ -24,6 +24,8 @@ public interface IMeterWorkImageService extends IBaseService<MeterWorkImage, Str
 
     ArrayList<String> queryUrl(String actualFirstNo);
 
+    ArrayList<String> queryRailwayUrl(String actualFirstNo);
+
     RESTfulResult doSaveWf(MeterWorkImage mwi);
 
 }

src/main/java/com/steerinfo/meterwork/meterworkimage/service/impl/MeterWorkImageServiceImpl.java

@@ -86,6 +86,56 @@ public class MeterWorkImageServiceImpl extends BaseServiceImpl<MeterWorkImage, S
 
     }
 
+    @Override
+    public ArrayList<String> queryRailwayUrl(String actualFirstNo) {
+
+        try {
+            if (actualFirstNo == null || "".equals(actualFirstNo)) {
+                throw  new MarkerMetException(0,"计量作业编号为空!!");
+            }
+            MeterWorkImage mwi = meterWorkImageMapper.selectByPrimaryKey(actualFirstNo);
+            if(mwi==null) {
+                throw  new MarkerMetException(0,"该计量作业编号不存在图片!!");
+            }
+            ArrayList<String> urls=new ArrayList<>();
+            if (mwi.getImageFile1() != null && !mwi.getImageFile1().equals("")) {
+                String no = mwi.getImageFile1();
+                urls.add(no);
+            }
+            if (mwi.getImageFile2() != null && !mwi.getImageFile2().equals("")) {
+                String no = mwi.getImageFile2();
+                urls.add(no);
+            }
+            if (mwi.getImageFile3() != null && !mwi.getImageFile3().equals("")) {
+                String no = mwi.getImageFile3();
+                urls.add(no);
+            }
+            if (mwi.getImageFile4() != null && !mwi.getImageFile4().equals("")) {
+                String no = mwi.getImageFile4();
+                urls.add(no);
+            }
+            if (mwi.getImageFile5() != null && !mwi.getImageFile5().equals("")) {
+                String no = mwi.getImageFile5();
+                urls.add(no);
+            }
+            if (mwi.getImageFile6() != null && !mwi.getImageFile6().equals("")) {
+                String no = mwi.getImageFile6();
+                urls.add(no);
+            }
+            if (mwi.getImageFile7() != null && !mwi.getImageFile7().equals("")) {
+                String no = mwi.getImageFile7();
+                urls.add(no);
+            }
+            if (mwi.getImageFile8() != null && !mwi.getImageFile8().equals("")) {
+                String no = mwi.getImageFile8();
+                urls.add(no);
+            }
+            return urls;
+        } catch (MarkerMetException e){
+            throw  e;
+        }
+    }
+
     /**
      * 图片新增操作
      * @param mwi