后端修改

src/main/java/com/steerinfo/baseinfo/meterbasetermtaredata/mapper/MeterBaseTermTareDataMapper.xml

@@ -587,7 +587,7 @@
   <select id="selectByCarNo" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     select * from METER_BASE_TERM_TARE_DATA
     where CAR_NO = '${carNo}'
-    and END_TIME >= to_date('${endTime}', 'yyyy-MM-dd HH24:mi:ss')
+    and END_TIME >= to_date('${endTime}', 'yyyy/MM/dd HH24:mi:ss')
     and rownum = 1 ORDER BY CREATE_TIME desc
   </select>
 

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

@@ -3603,13 +3603,13 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 netDb.setNetWeight(net);
             }
             netDb.setUploadFlag("1");
-            netDb.setActualFirst1No(formatter.format(new Date()) + no);
+            netDb.setActualFirst1No(secondDb.getActualFirstNo());
             meterWorkCarActualMapper.insert(netDb);
 
             //4、将期限皮重转化为一条皮重计量数据保存
             MeterBaseTermTareData mbttd = new MeterBaseTermTareData();
             HashMap mbMap = new HashMap();
-            SimpleDateFormat mbsdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            SimpleDateFormat mbsdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
             mbMap.put("endTime",mbsdf.format(new Date()));
             if(StringUtils.isNotEmpty(netDb.getActualFirst2No())){
                 mbMap.put("dataNo",netDb.getActualFirst2No());
@@ -4106,6 +4106,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
                 String no = meterBaseTermTareDataMapper.getNewID(sdf.format(new Date()));
                 termData.setDataNo(sdf.format(new Date()) + no);
+                termData.setBaseSpotNo(tareModel.getBaseSpotNo());
+                termData.setBaseSpotName(tareModel.getBaseSpotName());
+                termData.setCarNo(tareModel.getCarNo());
                 termData.setMeterName(tareModel.getCreateManName());
                 termData.setMeterTime(grossModel.getCreateTime());
                 termData.setStartTime(grossModel.getCreateTime());

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/controller/MeterWorkRailwayActFirstController.java

@@ -20,6 +20,7 @@ import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayAc
 import com.steerinfo.meterwork.meterworkrailwayactfirst.service.IMeterWorkRailwayActFirstService;
 import com.steerinfo.meterwork.meterworkrailwayactual.mapper.MeterWorkRailwayActualMapper;
 import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
+import com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived;
 import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
 import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import com.steerinfo.util.StringUtils;
@@ -981,4 +982,43 @@ throw new MarkerMetException(500, "操作异常！！");
         }
         return rm;
     }
+
+    @ApiOperation(value = "动态衡维护界面--皮重保存", notes = "根据List<MeterWorkRailwayActFirst>对象进行批量修改重量类型")
+    @PostMapping(value = "/doAddRailWf")
+    public RESTfulResult doAddRailWf(@RequestBody List<MeterWorkRailwayActFirst> models) {
+        RESTfulResult rm = failed();
+        try {
+            if(models.size() >= 1) {
+                rm = meterWorkRailwayActFirstService.doAddRailWf(models);
+            }else {
+                rm.setMessage("至少需要选择一条数据进行皮重保存，请确认！！！！");
+            }
+            return rm;
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！>>>>" + e.getMessage());
+            return rm;
+        }
+    }
+
+    @ApiOperation(value = "动态衡维护界面--毛皮匹配洁净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配洁净保存")
+    @PostMapping(value = "/doAddRailNetWf")
+    public RESTfulResult doAddRailNetWf(@RequestBody List<MeterWorkRailwayActFirst> grossModels, List<MeterWorkRailwayActFirst> tareModels) {
+        RESTfulResult rm = failed();
+        try {
+            if(grossModels.size() >= 1 && tareModels.size() >= 1) {
+                rm = meterWorkRailwayActFirstService.doAddRailNetWf(grossModels, tareModels);
+            }else if(grossModels.size() < 1){
+                rm.setMessage("至少需要选择一条毛重数据进行匹配洁净保存，请确认！！！！");
+            }else if(tareModels.size() < 1) {
+                rm.setMessage("至少需要选择一条皮重数据进行匹配洁净保存，请确认！！！！");
+            }
+            return rm;
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！>>>>" + e.getMessage());
+            return rm;
+        }
+    }
+
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/IMeterWorkRailwayActFirstService.java

@@ -10,6 +10,7 @@ import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst;
 import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
+import com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived;
 import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
 import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import org.springframework.transaction.annotation.Transactional;
@@ -100,5 +101,7 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
     RESTfulResult HistoricalTare(String actualNo, String predictionNo);
 
     RESTfulResult supplementaryData(MeterWorkRailwayActFirst model);
+    RESTfulResult doAddRailWf(List<MeterWorkRailwayActFirst> models);
+    RESTfulResult doAddRailNetWf(List<MeterWorkRailwayActFirst> grossModels,List<MeterWorkRailwayActFirst> tareModels);
 }
 

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

@@ -29,6 +29,7 @@ import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayAc
 import com.steerinfo.meterwork.meterworkrailwayactfirst.service.IMeterWorkRailwayActFirstService;
 import com.steerinfo.meterwork.meterworkrailwayactual.mapper.MeterWorkRailwayActualMapper;
 import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
+import com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived;
 import com.steerinfo.pretrack.prerailwayscale.mapper.PreRailwayScaleMapper;
 import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
 import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
@@ -2931,6 +2932,90 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         return pageInfo;
     }
 
+    @Override
+    public RESTfulResult doAddRailWf(List<MeterWorkRailwayActFirst> models) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            for(MeterWorkRailwayActFirst model: models) {
+                meterWorkRailwayActFirstMapper.insertSelective(model);
+            }
+            int count = 0;
+            for(MeterWorkRailwayActFirst model: models) {
+                model.setWeightType("1");
+                model.setCreateTime(new Date());
+                int i = meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model);
+                if(i >= 1) {
+                    count++;
+                }
+            }
+            rm.setSucceed();
+            rm.setCode("200");
+            rm.setMessage("操作成功,总共" + count + "条及记录转换成功！！");
+        }catch(Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常,请确认！！！>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
+    @Override
+    public RESTfulResult doAddRailNetWf(List<MeterWorkRailwayActFirst> grossModels, List<MeterWorkRailwayActFirst> tareModels) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            int count = 0;
+            for(MeterWorkRailwayActFirst grossModel: grossModels) {
+                for(MeterWorkRailwayActFirst tareModel: tareModels) {
+                    if(tareModel.getRailwayNo().equals(grossModel.getRailwayNo())) {
+                        //更新一次数据
+                        //更新第一次毛重数据库
+                        grossModel.setValueFlag(DbConstants.NET);
+                        grossModel.setUpdateManName("system");
+                        grossModel.setUpdateManName("手动匹配洁净更新");
+                        grossModel.setUpdateTime(new Date());
+                        meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossModel);
+                        //更新第一次皮重数据库
+                        tareModel.setValueFlag(DbConstants.NET);
+                        tareModel.setUpdateManName("system");
+                        tareModel.setUpdateManName("手动匹配洁净更新");
+                        tareModel.setUpdateTime(new Date());
+                        meterWorkRailwayActFirstMapper.updateByPrimaryKey(tareModel);
+
+                        MeterWorkRailwayActual actualRow = new MeterWorkRailwayActual();
+                        MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAdd(grossModel.getActualFirstNo(), tareModel.getActualFirstNo());
+                        BeanUtils.copyProperties(mwca1, actualRow);
+
+                        //添加结净数据
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+                        String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
+                        actualRow.setActualNo(sdf.format(new Date()) + no);
+                        actualRow.setNetTime(new Date());
+                        actualRow.setNetMode(DbConstants.TYPE);
+                        actualRow.setNote("手动匹配洁净");
+                        actualRow.setNetMode("2");
+                        actualRow.setUploadFlag("1");
+                        actualRow.setValueFlag("1");
+                        actualRow.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
+                        int i= meterWorkRailwayActualMapper.insertSelective(actualRow);
+
+                        if(i >= 1) {
+                            count++;
+                        }
+                    }
+
+                }
+            }
+            rm.setSucceed();
+            rm.setCode("200");
+            rm.setMessage("操作成功,总共" + count + "条及记录匹配洁净成功！！");
+        }catch(Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常,请确认！！！>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
     public static void main(String[] args) {
         BigDecimal a = new BigDecimal(95120);
         BigDecimal b = a.divide(new BigDecimal(1000));