后端修改

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.xml

@@ -3177,7 +3177,7 @@
        t1.actual_first_no ACTUAL_FIRST1_NO, t1.meter_weight GROSS_WEIGHT, t1.create_man_no GROSS_MAN_NO, t1.create_man_name GROSS_MAN_NAME, t1.create_time GROSS_TIME,
        t1.base_spot_no BASE_SPOT1_NO, t1.base_spot_name BASE_SPOT1_NAME,t1.meter_class GROSS_CLASS, t1.meter_group GROSS_GROUP, t1.meter_mode GROSS_MODE,t2.data_source,
        t2.actual_first_no ACTUAL_FIRST2_NO, t2.meter_weight TARE_WEIGHT, t2.create_man_no TARE_MAN_NO, t2.create_man_name TARE_MAN_NAME, t2.create_time TARE_TIME,
-       t2.base_spot_no BASE_SPOT2_NO, t2.base_spot_name BASE_SPOT2_NAME, t2.meter_class TARE_CLASS, t2.meter_group TARE_GROUP,t2.meter_mode TARE_MODE,t1.METER_NUM METER_NUM
+       t2.base_spot_no BASE_SPOT2_NO, t2.base_spot_name BASE_SPOT2_NAME, t2.base_spot_no net_spot3_no, t2.base_spot_name net_spot3_name, t2.create_time create_time,  t2.create_man_name create_man_name, t2.meter_class TARE_CLASS, t2.meter_group TARE_GROUP,t2.meter_mode TARE_MODE,t1.METER_NUM METER_NUM
     from METER_WORK_CAR_ACTUAL_FIRST t1,METER_WORK_CAR_ACTUAL_FIRST t2
     where t1.actual_first_no=#{actualFirstNo,jdbcType=VARCHAR} and t2.actual_first_no=#{dataNo,jdbcType=VARCHAR}
  </select>
@@ -3197,7 +3197,7 @@
                t1.actual_first_no ACTUAL_FIRST1_NO, t1.meter_weight GROSS_WEIGHT, t1.create_man_no GROSS_MAN_NO, t1.create_man_name GROSS_MAN_NAME, t1.create_time GROSS_TIME,
                t1.base_spot_no BASE_SPOT1_NO, t1.base_spot_name BASE_SPOT1_NAME,t1.meter_class GROSS_CLASS, t1.meter_group GROSS_GROUP, t1.meter_mode GROSS_MODE,
                t2.actual_first_no ACTUAL_FIRST2_NO, t2.meter_weight TARE_WEIGHT, t2.create_man_no TARE_MAN_NO, t2.create_man_name TARE_MAN_NAME, t2.create_time TARE_TIME,
-               t2.base_spot_no BASE_SPOT2_NO, t2.base_spot_name BASE_SPOT2_NAME, t2.base_spot_no net_spot3_no, t2.base_spot_name net_spot3_name, t2.meter_class TARE_CLASS, t2.meter_group TARE_GROUP,t2.meter_mode TARE_MODE,t1.METER_NUM METER_NUM
+               t2.base_spot_no BASE_SPOT2_NO, t2.base_spot_name BASE_SPOT2_NAME, t2.base_spot_no net_spot3_no, t2.base_spot_name net_spot3_name, t2.create_time create_time,  t2.create_man_name create_man_name, t2.meter_class TARE_CLASS, t2.meter_group TARE_GROUP,t2.meter_mode TARE_MODE,t1.METER_NUM METER_NUM
         from METER_WORK_CAR_ACTUAL_FIRST t1,METER_WORK_CAR_ACTUAL_FIRST t2, PRE_TRACK_SCALE T3
         where t1.actual_first_no=#{actualFirstNo,jdbcType=VARCHAR} and t2.actual_first_no=#{dataNo,jdbcType=VARCHAR} AND T3.prediction_no =#{predictionNo,jdbcType=VARCHAR}
     </select>

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

@@ -1030,6 +1030,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         if (mwcaquery == null) {
             throw new MarkerMetException(500, "不存在对应的洁净数据");
         }
+
         UserPayload payload = UserPayload.getCurrUser();
         String userId = payload.getId();
         String userName = payload.getUserName();

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/controller/MeterWorkCarActualFirstController.java

@@ -18,7 +18,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import oracle.jdbc.proxy.annotation.Pre;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;

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

@@ -2345,6 +2345,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     meterWorkRailwayActFirst.setArrival(prs.getArrival());
                     meterWorkRailwayActFirst.setStation(prs.getStation());
                     meterWorkRailwayActFirst.setSourceArea(prs.getSourceArea());
+                    meterWorkRailwayActFirst.setIsPreSacale("1");
                 }
 
                 meterWorkRailwayActFirst.setCreateTime(new Date());
@@ -2561,6 +2562,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
         //补充数据
         netRail.setPredictionNo(prs.getPredictionNo());
+        netRail.setIsPreSacale("1");
         netRail.setNoticeNo(prs.getNoticeNo());
         netRail.setMatterNo(prs.getMatterNo());
         netRail.setMatterName(prs.getMatterName());

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/model/MeterWorkRailwayActual.java

@@ -346,9 +346,9 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
     private String netGroup;
 
     /**
-     * 结净方式（1：正常结净；2：匹配结净）(NET_MODE,VARCHAR,1)
+     * 结净方式（1：正常结净；2：匹配结净；3：双委托洁净；4：混装洁净；5：混卸洁净）(NET_MODE,VARCHAR,1)
      */
-    @ApiModelProperty(value="结净方式（1：正常结净；2：匹配结净）",required=false)
+    @ApiModelProperty(value="结净方式（1：正常结净；2：匹配结净；3：双委托洁净；4：混装洁净；5：混卸洁净）",required=false)
     private String netMode;
 
     /**
@@ -651,6 +651,18 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
     @ApiModelProperty(value="是否生成电子磅单标识（0:未生成, 1:已生成）",required=false)
     private String isBoundList;
 
+    /**
+     * 电子签章系统合同ID(CONTRACT_ID,VARCHAR,50)
+     */
+    @ApiModelProperty(value="电子签章系统合同ID",required=false)
+    private String contractId;
+
+    /**
+     * 是否已从电子签章系统下载电子磅单(IS_BOUND_LIST_DOWNLOADED,VARCHAR,1)
+     */
+    @ApiModelProperty(value="是否已从电子签章系统下载电子磅单",required=false)
+    private String isBoundListDownloaded;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -1519,6 +1531,22 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
         this.isBoundList = isBoundList == null ? null : isBoundList.trim();
     }
 
+    public String getContractId() {
+        return contractId;
+    }
+
+    public void setContractId(String contractId) {
+        this.contractId = contractId == null ? null : contractId.trim();
+    }
+
+    public String getIsBoundListDownloaded() {
+        return isBoundListDownloaded;
+    }
+
+    public void setIsBoundListDownloaded(String isBoundListDownloaded) {
+        this.isBoundListDownloaded = isBoundListDownloaded == null ? null : isBoundListDownloaded.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -1632,6 +1660,8 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
         sb.append(", predictionCombination=").append(predictionCombination);
         sb.append(", boundListUrl=").append(boundListUrl);
         sb.append(", isBoundList=").append(isBoundList);
+        sb.append(", contractId=").append(contractId);
+        sb.append(", isBoundListDownloaded=").append(isBoundListDownloaded);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();