Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/flow/GetNodeQuery.java

@@ -22,6 +22,9 @@ public class GetNodeQuery implements Query {
     @NotBlank(message = "参数错误：taskDefKey")
     private String taskDefKey;
 
+    @ApiModelProperty(value = "调账申请sid")
+    private String sid;
+
     @ApiModelProperty("调账车辆列表")
     private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicle.java

@@ -72,6 +72,8 @@ public class BaseInternalPurchaseVehicle extends BaseEntity {
     private String inventoryLocationName; // 库存地点名称
     @ApiModelProperty("内销价格")
     private String witPinMoney; // 内销价格
+    @ApiModelProperty("初始内销价格")
+    private String initialWitPinMoney; // 初始内销价格
     @ApiModelProperty("发票类型key")
     private String invoiceTypeKey; // 发票类型key
     @ApiModelProperty("发票类型value")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDetailsVo.java

@@ -69,6 +69,8 @@ public class BaseInternalPurchaseVehicleDetailsVo implements Vo {
     private String inventoryLocationName; // 库存地点名称
     @ApiModelProperty("内销价格")
     private String witPinMoney; // 内销价格
+    @ApiModelProperty("初始内销价格")
+    private String initialWitPinMoney; // 初始内销价格
     @ApiModelProperty("发票类型key")
     private String invoiceTypeKey; // 发票类型key
     @ApiModelProperty("发票类型value")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDto.java

@@ -73,6 +73,8 @@ public class BaseInternalPurchaseVehicleDto implements Dto {
     private String inventoryLocationName; // 库存地点名称
     @ApiModelProperty("内销价格")
     private String witPinMoney; // 内销价格
+    @ApiModelProperty("初始内销价格")
+    private String initialWitPinMoney; // 初始内销价格
     @ApiModelProperty("发票类型key")
     private String invoiceTypeKey; // 发票类型key
     @ApiModelProperty("发票类型value")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleVo.java

@@ -73,6 +73,8 @@ public class BaseInternalPurchaseVehicleVo implements Vo {
     private String inventoryLocationName; // 库存地点名称
     @ApiModelProperty("内销价格")
     private String witPinMoney; // 内销价格
+    @ApiModelProperty("初始内销价格")
+    private String initialWitPinMoney; // 初始内销价格
     @ApiModelProperty("发票类型key")
     private String invoiceTypeKey; // 发票类型key
     @ApiModelProperty("发票类型value")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java

@@ -25,16 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.base.api.basevehicletempstate;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * Project: comc(comc) <br/>
  * File: BaseVehicleTempstateFeign.java <br/>
@@ -79,5 +77,5 @@ public interface BaseVehicleTempstateFeign {
     @ApiOperation("根据业务sid删除记录")
     @DeleteMapping("/delByBusSid")
     @ResponseBody
-    public ResultBean delByBusSid(String businessSid);
+    public ResultBean delByBusSid(@RequestParam("businessSid") String businessSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -379,16 +379,28 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                     String witPinMoney1 = baseInternalPurchaseVehicle1.getWitPinMoney();
                     if (!witPinMoney.equals(witPinMoney1)) {
                         i = true;
-                        break;
+                        baseInternalPurchaseVehicleService.updateWitPinMoneyBySid(witPinMoney, sid);
                     }
                 }
             }
+        } else {
+            for (String s : purchaseSids) {
+                BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
+                String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
+                String initialWitPinMoney = baseInternalPurchaseVehicle.getInitialWitPinMoney();
+                if (!witPinMoney.equals(initialWitPinMoney)) {
+                    i = true;
+                    break;
+                }
+            }
         }
         Map<String, Object> map = new HashMap<>();
         Map<String, Object> formVariables = bv.getFormVariables();
         if (formVariables == null) {
             map.put("isAdj", i);
             bv.setFormVariables(map);
+        }else {
+            formVariables.put("isAdj", i);
         }
         if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
@@ -423,7 +435,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                     /**
                      *  //采购组织:FPurchaseOrgId  (必填项)
                      */
-                    stkInStock.setFPurchaseOrgId("102");
+                    stkInStock.setFPurchaseOrgId("101");
                     /**
                      * // 供应商:FSupplierId  (必填项)
                      */
@@ -512,7 +524,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             /**
              * 物料编码:FMaterialID
              */
-            fe.setFMaterialID(" JX091054");
+            fe.setFMaterialID(baseInternalPurchaseVehicle.getVinNo());
             /**
              * 库存单位:FUnitID  (必填项)
              */
@@ -532,8 +544,8 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             /**
              * 仓库:FStockID
              */
-            //fe.setFStockID("CK001");
+            fe.setFStockID("CK001");
-            fe.setFStockID(baseInternalPurchaseVehicle.getInventoryLocationSid());
+            //fe.setFStockID(baseInternalPurchaseVehicle.getInventoryLocationSid());
             /**
              * 库存状态:FStockStatusID
              */
@@ -549,6 +561,25 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid());
         if (baseAccadjApply.getAccadjTypeValue().equals("调入")) {
             String callOutOrgSid = baseAccadjApply.getCallOutOrgSid();
+            List<String> purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
+            Boolean i = false;
+            for (String s : purchaseSids) {
+                BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
+                String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
+                String initialWitPinMoney = baseInternalPurchaseVehicle.getInitialWitPinMoney();
+                if (!witPinMoney.equals(initialWitPinMoney)) {
+                    i = true;
+                    break;
+                }
+            }
+            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> formVariables = bv.getFormVariables();
+            if (formVariables == null) {
+                map.put("isAdj", i);
+                bv.setFormVariables(map);
+            }else {
+                formVariables.put("isAdj", i);
+            }
             ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
             //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
             List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
@@ -668,8 +699,19 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                     }
                 }
             }
-            bv.getFormVariables().put("isAdj", i);
+        } else {
+            List<String> stringList = baseAccadjApplyeVehService.fetchByMainSid(query.getSid());
+            for (String s : stringList) {
+                BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
+                String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
+                String initialWitPinMoney = baseInternalPurchaseVehicle.getInitialWitPinMoney();
+                if (!witPinMoney.equals(initialWitPinMoney)) {
+                    i = true;
+                    break;
+                }
             }
+        }
+        bv.getFormVariables().put("isAdj", i);
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -239,6 +239,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                 baseInternalPurchaseVehicle1.setRecallStateValue(VehicleState.RecallState.UN_RECALL.getRemarks());
                 baseInternalPurchaseVehicle1.setIsAccadj("0");
                 baseInternalPurchaseVehicle1.setIsInvoicing("0");
+                baseInternalPurchaseVehicle1.setInitialWitPinMoney(baseInternalPurchaseVehicle1.getWitPinMoney());
                 baseInternalPurchaseVehicleService.save(baseInternalPurchaseVehicle1);
             }
             return rb.success().setMsg("保存成功").setData(baseInternalPurchase.getSid());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleMapper.java

@@ -81,4 +81,7 @@ public interface BaseInternalPurchaseVehicleMapper extends BaseMapper<BaseIntern
 	void updateIsInvoicing(@Param("purchaseSid") String purchaseSid,@Param("isInvoicing") String isInvoicing);
 
     List<AppCompanyShuntingListVo> getListBySid(String sid);
+
+	@Update("update base_internal_purchase_vehicle set witPinMoney = #{witPinMoney} where sid = #{sid}")
+    void updateWitPinMoneyBySid(@Param("witPinMoney") String witPinMoney,@Param("sid") String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleService.java

@@ -129,4 +129,8 @@ public class BaseInternalPurchaseVehicleService extends MybatisBaseService<BaseI
 	public List<AppCompanyShuntingListVo> getListBySid(String sid) {
 		return baseMapper.getListBySid(sid);
 	}
+
+	public void updateWitPinMoneyBySid(String witPinMoney,String sid) {
+		baseMapper.updateWitPinMoneyBySid(witPinMoney,sid);
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -174,20 +174,19 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             if (eventType.equals(OperVehicleState.EventType.UPDATE_VEHICLE.getCode()))
                 baseVehicleService.updateVeh(baseVehicle);
             //入账生成台账
-            if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode()))
+            if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())){
                 baseVehicleService.saveVeh_rz(baseVehicle);
+                kingdeeStkInStock(dto);
+            }
             //外采入库生成台账
-            if (eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode()))
+            if (eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())){
                 baseVehicleService.saveVeh_wc(baseVehicle);
+                kingdeeStkInStock(dto);
+            }
             //调车入库生成台账
             if (eventType.equals(OperVehicleState.EventType.TC_SAVEVEH.getCode()))
                 baseVehicleService.saveVeh_tc(baseVehicle);
         }
-        //入账生成台账  //外采入库生成台账
-        if (eventType.equals(OperVehicleState.EventType.RZ_SAVEVEH.getCode())||
-                eventType.equals(OperVehicleState.EventType.WC_SAVEVEH.getCode())){
-            kingdeeStkInStock(dto);
-        }
         return rb.success().setMsg("保存成功");
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -1917,7 +1917,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             messageFlowableQuery.setMsgContent(busMainDeposit.getStaffName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
             messageFlowableQuery.setMsgTitle("业务中心");
             ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
-//            String msgSid = getMessage(ufVo, appMap, busMainDeposit);
             return voResultBean;
         }
         if (r == 2) {
@@ -1942,7 +1941,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         bv.setOrgSidPath(data.getOrgSidPath());
         Map<String, Object> variables = new HashMap<>();
         Map<String, Object> appMap = new HashMap<>();
-        appMap.put("sid", bv.getBusinessSid());
+        appMap.put("virtualOrderSid", bv.getBusinessSid());
         variables.put("app", appMap);
         bv.setFormVariables(variables);
         if (bv.getTaskId().equals(busMainDeposit.getTaskId())) {
@@ -2054,7 +2053,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 BeanUtil.copyProperties(query, flowTaskVo);
                 Map<String, Object> variables = new HashMap<>();
                 Map<String, Object> appMap = new HashMap<>();
-                appMap.put("sid", appMap);
+                appMap.put("virtualOrderSid", appMap);
                 variables.put("app", appMap);
                 flowTaskVo.setValues(variables);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
@@ -2154,60 +2153,4 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         return rb.setMsg("操作失败!提交的数据不一致!");
     }
 
-   /* public String getMessage(UpdateFlowFieldVo ufVo, Map<String, Object> appMap, BusMainDeposit busMainDeposit) {
-        //=====极光推送信息========================================参数组装
-        String procId = busMainDeposit.getProcInsId();
-        ResultBean<List<LatestTaskVo>> resultBean = flowTaskFeign.getLatestTasks(procId);
-        String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_();
-        List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-        //根据用户的sid查询用户的id
-        ResultBean<String> stringList1 = sysUserFeign.selectIdBySid(receiveSidList);
-        List<String> reveiveIdList = Arrays.asList(stringList1.getData().split(","));
-        MessageFlowableDto messageFlowableDto = new MessageFlowableDto();
-        MessageJsonDto messageJsonDto = new MessageJsonDto();
-        BeanUtil.copyProperties(ufVo, messageJsonDto);
-        //查询流程审批的页面操作地址组装json的参数
-        //根据taskDef和移动端标识
-        String proDefId = "";
-        String name = "";
-        if ("01".equals(busMainDeposit.getDepositBillTypeKey())) {//订金收取
-            proDefId = ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId();
-            name = "简易订单申请-订金收取";
-        } else {
-            if ("02".equals(busMainDeposit.getDepositBillTypeKey())) {//车辆预定
-                proDefId = ProcDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId();
-                name = "简易订单申请-车辆预定";
-            }
-        }
-        ResultBean<SysProUrlVo> selectUrlByKey = sysProUrlFeign.selectUrlByKey(proDefId, ufVo.getTaskDefKey(), "1", "2");
-        SysProUrlVo sysProUrlVo = selectUrlByKey.getData();
-        messageFlowableDto.setBusinessSid(busMainDeposit.getSid());
-        messageFlowableDto.setApp_type("2");
-        if (sysProUrlVo.getUrl().contains("#")) {
-            messageFlowableDto.setModuleAction(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(0));
-            List<Integer> codesInteger = Arrays.asList(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(1).split(",")).stream().map(Integer::parseInt).collect(Collectors.toList());
-            int[] ints = codesInteger.stream().mapToInt(Integer::valueOf).toArray();
-            ;
-            messageJsonDto.setButtons(ints);
-        } else {
-            messageFlowableDto.setModuleAction(sysProUrlVo.getUrl());
-        }
-        messageFlowableDto.setModuleSid(Arrays.asList(sysProUrlVo.getModulePluginName().split("#")).get(0));
-        messageJsonDto.setTaskName(ufVo.getNodeState());
-        messageJsonDto.setProcInsId(ufVo.getProcInsId());
-        messageJsonDto.setAppMap(appMap);
-        messageFlowableDto.setJson(messageJsonDto);
-        messageFlowableDto.setList(receiveSidList);
-        messageFlowableDto.setReceiveIdList(reveiveIdList);
-        messageFlowableDto.setModuleName(name);
-        messageFlowableDto.setMsgContent(name);
-        messageFlowableDto.setMsgTitle(name);
-        messageFlowableDto.setCreateName(busMainDeposit.getStaffName());
-        messageFlowableDto.setTaskId(ufVo.getTaskId());
-        ResultBean<String> stringResultBean = messageFeign.getMessage(messageFlowableDto);
-        String msgSid = stringResultBean.getData();
-        return msgSid;
-
-    }*/
-
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java

@@ -64,6 +64,6 @@ public interface ScmSpecialRebateMapper extends BaseMapper<ScmSpecialRebate> {
 	@Select("select * from scm_special_rebate")
 	List<ScmSpecialRebateVo> selectListVo();
 
-	@Update("update from scm_special_rebate set state = 1 where sid = #{specialRebateSid}")
+	@Update("update scm_special_rebate set state = 1 where sid = #{specialRebateSid}")
     void updateState(String specialRebateSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java

@@ -87,7 +87,7 @@ public class ScmSpecialRebateWithApplyRest implements ScmSpecialRebateWithApplyF
 
 	@Override
 	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
+    @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
 		return scmSpecialRebateWithApplyService.delAll(sids);
 	}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -850,6 +850,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
      */
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         ScmVehicleGression scmVehicleGression = fetchBySid(bv.getBusinessSid());
         Map<String, Object> variables = new HashMap<>();
         Map<String, Object> appMap = new HashMap<>();
@@ -872,7 +873,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if (!"Event_end".equals(ufVo.getTaskDefKey())) {
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
                 //极光推送
                 scmVehicleGression = fetchBySid(bv.getBusinessSid());
                 ufVo.setProcInsId(scmVehicleGression.getProcInstId());
@@ -887,6 +887,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 messageFlowableQuery.setMsgContent(scmVehicleGression.getApplicantName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
                 messageFlowableQuery.setMsgTitle("供应链");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+
+            }else{
                 //推送车辆台账数据
                 VehicleGression vehicleGression = new VehicleGression();
                 List<String> list = scmVehicleGressionVehService.fetchVoByMainSid(scmVehicleGression.getSid());
@@ -926,6 +928,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                         fBillEntry.setFDestStockId("CK003");//调入仓库
                         fBillEntry.setFMaterialId(s);//物料编码
                         fBillEntry.setFSrcStockId("CK001");//调出仓库
+                        fBillEntry.setFLot(s);
+                        fBillEntry.setFDestLot(s);
                         FPAYBILLENTRYs.add(fBillEntry);
                         stkTransferDirect.setFBillEntry(FPAYBILLENTRYs);
                         finKingDeeFeign.draftStkTransferDirect(stkTransferDirect);
@@ -1162,9 +1166,11 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         temporaryExitPermitInfo.setOrgName(sysOrganization.getName());
         temporaryExitPermitInfo.setDate(new Date());
         temporaryExitPermitInfo.setContractNo("—");
+        if(StringUtils.isNotBlank(scmVehicleGression.getVehicleSid())){
             BaseVehicleSelectVo data = baseVehicleFeign.details(scmVehicleGression.getVehicleSid()).getData();
             ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleFeign.selectExiCarConfig(data.getModelSid(), data.getModelConfigSid(), data.getVehModelConfigSid()).getData();
             temporaryExitPermitInfo.setModelName(exiCarConfigDetailVo.getVehicleAlias() + exiCarConfigDetailVo.getCarColor());
+        }
         temporaryExitPermitInfo.setNum("1");
         temporaryExitPermitInfo.setVinNo(scmVehicleGression.getVinNo());
         temporaryExitPermitInfo.setReason("存放地点变更");

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java

@@ -64,7 +64,7 @@ public interface ScmVehRebateMapper extends BaseMapper<ScmVehRebate> {
 	@Select("select * from scm_veh_rebate")
 	List<ScmVehRebateVo> selectListVo();
 
-	@Update("update from scm_veh_rebate set state = 1 where sid = #{sid}")
+	@Update("update scm_veh_rebate set state = 1 where sid = #{sid}")
     void updateState(String sid);
 
 	ScmVehRebateVo selectByVinNoAndOrgSid(@Param("vinNo") String vinNo,@Param("createOrgSid") String createOrgSid);