后端修改

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/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -968,7 +968,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                     rm.setMessage("洁净数据中车号和预报中车号不一致，请确认！！");
                     return rm;
                 }
-                if (scale.getPredictionType().equals("1")) {
+                if (!scale.getPredictionType().equals("1")) {
                     rm.setMessage("委托信息不是普通委托不能进行匹配委托，请确认！！");
                     return rm;
                 }

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,8 @@ 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.meterworkrailwaymotorialreceived.model.MeterWorkRailwayMotorialReceived;
+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 +983,44 @@ 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 CommonCombination<List<MeterWorkRailwayMotorialReceived>, List<MeterWorkRailwayActFirst>, MeterBaseRailwayWeight,MeterBaseRailwayWeight> com) {
+        RESTfulResult rm = failed();
+        try {
+
+            if(com.getOne().size() >= 1 && com.getTwo().size() >= 1) {
+                rm = meterWorkRailwayActFirstService.doAddRailNetWf(com.getOne(), com.getTwo());
+            }else if(com.getOne().size() < 1){
+                rm.setMessage("至少需要选择一条毛重数据进行匹配洁净保存，请确认！！！！");
+            }else if(com.getTwo().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,8 @@ 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.meterworkrailwaymotorialreceived.model.MeterWorkRailwayMotorialReceived;
+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 +102,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<MeterWorkRailwayMotorialReceived> grossModels, List<MeterWorkRailwayActFirst> tareModels);
 }
 

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

@@ -29,6 +29,9 @@ 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.meterworkrailwaymotorialreceived.model.MeterWorkRailwayMotorialReceived;
+import com.steerinfo.meterwork.meterworkrailwayreceived.mapper.MeterWorkRailwayReceivedMapper;
+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;
@@ -70,6 +73,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     @Resource
     private PreRailwayScaleMapper preRailwayScaleMapper;
 
+    @Resource
+    private MeterWorkRailwayReceivedMapper meterWorkRailwayReceivedMapper;
+
     @Resource
     private MeterWorkRailwayActualMapper meterWorkRailwayActualMapper;
 
@@ -2931,6 +2937,167 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         return pageInfo;
     }
 
+    @Override
+    public RESTfulResult doAddRailWf(List<MeterWorkRailwayActFirst> models) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            int count = 0;
+            for (MeterWorkRailwayActFirst model : models) {
+                //若存在相同车号的数据，则将之前的数据状态还原，然后再删除一次计量表的数据，之后再新增一次计量表数据，以及修改数据状态
+                Map<String,Object> mp=new HashMap<>();
+                mp.put("railwayNo",model.getRailwayNo());
+                mp.put("valueFlag","1");
+                mp.put("railwayTypeNo","001019002");
+                List<MeterWorkRailwayActFirst> ll=meterWorkRailwayActFirstMapper.selectByParameters(mp);
+                if(ll!=null&&ll.size()>0){
+                    for(MeterWorkRailwayActFirst fs:ll){
+                        meterWorkRailwayActFirstMapper.deleteByPrimaryKey(fs.getActualFirstNo());
+                        preRailwayScaleMapper.updateMeterWorkRailwayReceiveds(fs.getActualFirstNo());
+                    }
+                }
+
+                meterWorkRailwayActFirstMapper.insertSelective(model);
+                meterWorkRailwayReceivedMapper.updateMeterWorkRailwayReceived(model.getActualFirstNo());
+                count++;
+            }
+            /*int count = 0;
+            for(MeterWorkRailwayActFirst model: models) {
+                model.setWeightType("1");
+                model.setCreateTime(new Date());
+                int i = meterWorkRailwayActFirstMapper.insertSelective(model);
+                int j = meterWorkRailwayMotorialReceive.update
+                if(i >= 1) {
+                    count++;
+                }
+            }
+            rm.setSucceed();
+            rm.setCode("200");
+            rm.setMessage("操作成功,总共" + 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<MeterWorkRailwayMotorialReceived> grossModels, List<MeterWorkRailwayActFirst> tareModels) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            int count = 0;
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+            String afl = sdf.format(new Date());
+            String userId ="",userName="";
+            try {
+                UserPayload payload = UserPayload.getCurrUser();
+                userId = payload.getId();
+                userName = payload.getUserName();
+            }catch (Exception ex){}
+
+            for(MeterWorkRailwayMotorialReceived received: grossModels){
+                for(MeterWorkRailwayActFirst first:tareModels){
+                    //两个车号一样则匹配，否则则不匹配
+                    if(first.getRailwayNo().equals(received.getRailwayNo())){
+                        //已使用 METER_WORK_RAILWAY_RECEIVED表状态设置为已使用
+                        preRailwayScaleMapper.updateMeterWorkRailwayReceived(received.getActualFirstNo());
+
+                        //将一次表中的皮重设置为已洁净
+                        first.setValueFlag("2");
+                        meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(first);
+
+                        //新增一条毛重信息
+                        MeterWorkRailwayActFirst second=new MeterWorkRailwayActFirst();
+                        second.setActualFirstNo(received.getActualFirstNo());
+                        second.setValueFlag("2");
+                        second.setRailwayNo(received.getRailwayNo());
+                        second.setRailwayCarriageNo(received.getRailwayCarriageNo());
+                        second.setRailwaySpeed(received.getRailwaySpeed());
+                        second.setMeterWeight(received.getMeterWeight());
+                        second.setCreateTime(received.getCreateTime());
+                        second.setCreateManNo(userId);
+                        second.setCreateManName(userName);
+                        second.setWeightType("0");
+                        second.setRailwayTypeNo(received.getRailwayTypeNo());
+                        second.setRailwayTypeName(received.getRailwayTypeName());
+                        second.setBaseSpotNo(received.getBaseSpotNo());
+                        second.setBaseSpotName(received.getBaseSpotName());
+                        second.setShipmentGrossWeight(received.getShipmentGrossWeight());
+                        second.setShipmentNetWeight(received.getShipmentNetWeight());
+                        second.setRailwayModelName(received.getRailwayModel());
+                        meterWorkRailwayActFirstMapper.insertSelective(second);
+
+
+                        //新增一条洁净数据
+                        MeterWorkRailwayActual netRail=new MeterWorkRailwayActual();
+                        String netNo = meterWorkRailwayActualMapper.getNewID(afl);
+                        netRail.setActualNo(afl + netNo);
+                        netRail.setRailwayNo(received.getRailwayNo());
+                        netRail.setRailwayCarriageNo(received.getRailwayCarriageNo());
+                        netRail.setGrossWeight(received.getMeterWeight());
+                        netRail.setGrossMode("1");
+                        netRail.setGrossManNo(userId);
+                        netRail.setGrossManName(userName);
+                        netRail.setGrossTime(received.getCreateTime());
+                        netRail.setGrossClass(received.getShipmentGrossWeight().doubleValue()+""); //左右偏载
+                        netRail.setGrossGroup(received.getShipmentNetWeight().doubleValue()+"");//前后偏载
+                        netRail.setBaseSpot1No(received.getBaseSpotNo());
+                        netRail.setBaseSpot1Name(received.getBaseSpotName());
+                        netRail.setActualFirst1No(second.getActualFirstNo());
+
+                        netRail.setRailwayTypeNo(received.getRailwayTypeNo());
+                        netRail.setRailwayTypeName(received.getRailwayTypeName());
+                        netRail.setConveyanceType(received.getRailwayModel());
+                        //netRail.setRailwayModelName(received.getRailwayModel());
+
+                        netRail.setTareWeight(first.getMeterWeight());
+                        netRail.setTareManNo(userId);
+                        netRail.setTareManName(userName);
+                        netRail.setTareTime(first.getCreateTime());
+                        netRail.setTareMode("1");
+                        netRail.setTareClass(first.getShipmentGrossWeight().doubleValue()+""); //左右偏载
+                        netRail.setTareGroup(first.getShipmentNetWeight().doubleValue()+"");//前后偏载
+                        netRail.setBaseSpot2No(first.getBaseSpotNo());
+                        netRail.setBaseSpot2Name(first.getBaseSpotName());
+                        netRail.setActualFirst2No(first.getActualFirstNo());
+
+                        netRail.setNetMode("1");
+                        netRail.setNetWeight(second.getMeterWeight().subtract(first.getMeterWeight()));
+                        netRail.setNetTime(new Date());
+                        netRail.setNetManNo(userId);
+                        netRail.setNetManName(userName);
+                        netRail.setNetSpot3No(received.getBaseSpotNo());
+                        netRail.setNetSpot3Name(received.getBaseSpotName());
+
+                        netRail.setValueFlag("0");
+                        netRail.setUploadFlag("0");
+
+                        netRail.setMeterTypeNo(received.getMeterTypeNo());
+                        netRail.setMeterTypeName(received.getMeterTypeName());
+
+                        int i  = meterWorkRailwayActualMapper.insertSelective(netRail);
+
+                        if(i >= 1) {
+                            count++;
+                        }
+                        break;
+                    }
+                }
+            }
+            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));

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/mapper/MeterWorkRailwayReceivedMapper.java

@@ -13,4 +13,6 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface MeterWorkRailwayReceivedMapper extends IBaseMapper<MeterWorkRailwayReceived, String> {
     String getNewID(@Param(value="afl")String afl);
+    void updateMeterWorkRailwayReceived(@feign.Param( value = "actualFirstNo") String actualFirstNo);
+    void updateMeterWorkRailwayReceiveds(String s);
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/mapper/MeterWorkRailwayReceivedMapper.xml

@@ -1764,6 +1764,13 @@
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
+  <update id="updateMeterWorkRailwayReceived">
+        update METER_WORK_RAILWAY_RECEIVED set value_flag='2' where ACTUAL_FIRST_NO=#{actualFirstNo}
+    </update>
+  <update id="updateMeterWorkRailwayReceiveds">
+        update METER_WORK_RAILWAY_RECEIVED set value_flag='1' where ACTUAL_FIRST_NO=#{actualFirstNo}
+    </update>
+
   <select id="getNewID" parameterType="java.lang.String" resultType="java.lang.String">
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(ACTUAL_FIRST_NO, LENGTH(ACTUAL_FIRST_NO) - 3))),0) + 1,4,'0') ACTUAL_FIRST_NO
     FROM METER_WORK_RAILWAY_RECEIVED where instr(ACTUAL_FIRST_NO,#{afl,jdbcType=VARCHAR})>0

src/main/java/com/steerinfo/meterwork/meterworkrailwayrecmain/service/impl/MeterWorkRailwayRecMainServiceImpl.java

@@ -44,10 +44,6 @@ public class MeterWorkRailwayRecMainServiceImpl extends BaseServiceImpl<MeterWor
             RESTfulResult rm = new RESTfulResult();
             rm.setCode("200");
             rm.setData(model.getActualNo());
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-            String afl = sdf.format(new Date());
-            String no = meterWorkRailwayRecMainMapper.getNewID(afl);
-            model.setActualNo(sdf.format(new Date()) + no);
             meterWorkRailwayRecMainMapper.insertSelective(model);
             rm.setMessage("成功");
             return rm;