|
@@ -3942,6 +3942,133 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
|
|
|
return rm;
|
|
return rm;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public RESTfulResult doAddRailAINetWf(List<MeterWorkRailwayMotorialReceived> grossModels, List<MeterBaseRailwayAiweight> 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(MeterBaseRailwayAiweight first:tareModels){
|
|
|
|
|
+ //两个车号一样则匹配,否则则不匹配
|
|
|
|
|
+ if(first.getRailwayNo().equals(received.getRailwayNo())){
|
|
|
|
|
+ MeterWorkRailwayActFirst AIFirst = new MeterWorkRailwayActFirst();
|
|
|
|
|
+ //已使用 METER_WORK_RAILWAY_RECEIVED表状态设置为已使用
|
|
|
|
|
+ preRailwayScaleMapper.updateMeterWorkRailwayReceived(received.getActualFirstNo());
|
|
|
|
|
+
|
|
|
|
|
+ //将一次表中的皮重设置为已洁净
|
|
|
|
|
+ String firstNo = afl + meterWorkRailwayActFirstMapper.getNewID(afl);
|
|
|
|
|
+ AIFirst.setActualFirstNo(firstNo);
|
|
|
|
|
+ AIFirst.setValueFlag("2");
|
|
|
|
|
+ AIFirst.setRailwayNo(first.getRailwayNo());
|
|
|
|
|
+ AIFirst.setMeterWeight(first.getMeterWeight());
|
|
|
|
|
+ AIFirst.setRailwayTypeNo(first.getRailwayTypeNo());
|
|
|
|
|
+ AIFirst.setRailwayTypeName(first.getRailwayTypeName());
|
|
|
|
|
+ AIFirst.setCreateManNo(first.getCreateManNo());
|
|
|
|
|
+ AIFirst.setCreateManName(first.getCreateManName());
|
|
|
|
|
+ AIFirst.setCreateTime(first.getCreateTime());
|
|
|
|
|
+ AIFirst.setRailwaySpeed(first.getRailwaySpeed());
|
|
|
|
|
+ AIFirst.setConveyanceType(first.getRailwayType());
|
|
|
|
|
+ meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(AIFirst);
|
|
|
|
|
+
|
|
|
|
|
+ //新增一条毛重信息
|
|
|
|
|
+ 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(AIFirst.getMeterWeight());
|
|
|
|
|
+ netRail.setTareManNo(userId);
|
|
|
|
|
+ netRail.setTareManName(userName);
|
|
|
|
|
+ netRail.setTareTime(AIFirst.getCreateTime());
|
|
|
|
|
+ netRail.setTareMode("1");
|
|
|
|
|
+ netRail.setTareClass(second.getShipmentGrossWeight().doubleValue()+""); //左右偏载
|
|
|
|
|
+ netRail.setTareGroup(second.getShipmentNetWeight().doubleValue()+"");//前后偏载
|
|
|
|
|
+ netRail.setBaseSpot2No(second.getBaseSpotNo());
|
|
|
|
|
+ netRail.setBaseSpot2Name(second.getBaseSpotName());
|
|
|
|
|
+ netRail.setActualFirst2No(second.getActualFirstNo());
|
|
|
|
|
+
|
|
|
|
|
+ netRail.setNetMode("1");
|
|
|
|
|
+ netRail.setNetWeight(second.getMeterWeight().subtract(AIFirst.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) {
|
|
|
|
|
+ meterWorkRailwayActFirstMapper.deleteByPrimaryKey(firstNo);
|
|
|
|
|
+ count++;
|
|
|
|
|
+ }
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ rm.setSucceed();
|
|
|
|
|
+ rm.setCode("200");
|
|
|
|
|
+ rm.setMessage("操作成功,总共" + count + "条记录匹配AI标志皮洁净成功!!");
|
|
|
|
|
+ }catch(Exception e) {
|
|
|
|
|
+ e.printStackTrace();
|
|
|
|
|
+ rm.setMessage("操作异常,请确认!!!>>>" + e.getMessage());
|
|
|
|
|
+ }
|
|
|
|
|
+ return rm;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public RESTfulResult selfServiceMeasurement(MeterWorkRailwayActFirst first) {
|
|
public RESTfulResult selfServiceMeasurement(MeterWorkRailwayActFirst first) {
|
|
|
RESTfulResult rm = new RESTfulResult();
|
|
RESTfulResult rm = new RESTfulResult();
|