修改了“汽车衡计量预报”接口

src/main/java/com/steerinfo/pretrack/pretrackscale/controller/PreTrackScaleController.java

@@ -306,7 +306,10 @@ public class PreTrackScaleController extends BaseRESTfulController {
             int num = preTrackScaleService.setPreIndex(model);
             if (num > 0) {
                 return success(num);
-            } else {
+            }
+            else if(num == -1){
+                return failed("已经存在已使用的委托，不可修改");
+            }else {
                 return failed("设置失败");
             }
         } catch (MarkerMetException e) {

src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.java

@@ -27,4 +27,6 @@ public interface PreTrackScaleMapper extends IBaseMapper<PreTrackScale, String>
 
     //查询预报的有效天数，写在 SHIPMENT_NUM字段中
     List<PreTrackScale> selectScaleValidPeriod();
+
+    List<PreTrackScale> selectValueFlag(Map<String, Object> parameters);
 }

src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.xml

@@ -3140,4 +3140,12 @@
         set t.update_man_no = 'system', t.update_man_name = '铁运接口超两天自动作废', t.update_time = sysdate, t.value_flag = '3'
         where t.create_time <![CDATA[<]]> sysdate - 2 and t.value_flag = '1';
     </update>
+
+    <!-- 查询某车辆当时委托中其他已使用的委托 -->
+    <select id="selectValueFlag" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <where>
+            PREDICTION_NO != #{predictionNo} and CAR_NO = #{carNo} and VALUE_FLAG = '4'
+        </where>
+    </select>
 </mapper>

src/main/java/com/steerinfo/pretrack/pretrackscale/service/impl/PreTrackScaleServiceImpl.java

@@ -294,6 +294,13 @@ public class PreTrackScaleServiceImpl extends BaseServiceImpl<PreTrackScale, Str
     @Transactional(rollbackFor = Exception.class)
     public int setPreIndex(PreTrackScale scale) {
         try {
+            HashMap<String, Object> obj = new HashMap<>();
+            obj.put("predictionNo", scale.getPredictionNo());
+            obj.put("carNo", scale.getCarNo());
+            List<PreTrackScale> com = preTrackScaleMapper.selectValueFlag(obj);
+            if(com.size()>0){
+                return -1;
+            }
             // 将该车已选为当次的委托重置为未选中
             List <PreTrackScale> preList = preTrackScaleMapper.selectuselist(scale.getCarNo());
             if (preList.size() > 0) {