app车型调价问题修改、盘库巡检验车问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/flow/BaseModelModPriceCompleteDto.java

@@ -19,7 +19,7 @@ public class BaseModelModPriceCompleteDto implements Dto {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
-    @NotBlank(message = "参数错误：orgSidPath")
+//    @NotBlank(message = "参数错误：orgSidPath")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@@ -66,10 +66,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -218,6 +215,11 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
         //用户sid
         bv.setUserSid(dto.getCreateBySid());
         bv.setFormVariables(variables);
+        //若app移动端有此功能，则传递appMap参数
+        Map<String, Object> appMap = new HashMap<>();
+        //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
+        appMap.put("sid", businessSid);
+        variables.put("app", appMap);
         //流程定义id
         bv.setModelId(ProcDefEnum.BASEMODELMODPRICE.getProDefId());
         if (r == 1) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceService.java

@@ -68,10 +68,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -137,7 +134,7 @@ public class BaseVehinstallModpriceService extends MybatisBaseService<BaseVehins
             return rb.success().setMsg("添加成功").setData(sid);
         }
         BaseVehinstallModprice baseVehinstallModprice = fetchBySid(dtoSid);
-        if (baseVehinstallModprice == null){
+        if (baseVehinstallModprice == null) {
             return rb.setMsg("该上装申请单不存在");
         }
         this.updateByDto(dto);
@@ -228,6 +225,11 @@ public class BaseVehinstallModpriceService extends MybatisBaseService<BaseVehins
         //用户sid
         bv.setUserSid(dto.getCreateBySid());
         bv.setFormVariables(variables);
+        //若app移动端有此功能，则传递appMap参数
+        Map<String, Object> appMap = new HashMap<>();
+        //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
+        appMap.put("sid", businessSid);
+        variables.put("app", appMap);
         //流程定义id
         bv.setModelId(ProcDefEnum.BASEVEHINSTALLMODPRICE.getProDefId());
         if (r == 1) {

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExamineDetailsVo.java

@@ -48,6 +48,8 @@ public class AppScmVehicleExamineDetailsVo implements Vo {
 
     @ApiModelProperty("定位")
     private String location;
+    @ApiModelProperty("经纬度code")
+    private String addressCode;
 
     @ApiModelProperty("车型配置差异说明")
     private String modelDifferenceExplain; // 车型配置差异说明

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDto.java

@@ -101,4 +101,10 @@ public class AppScmVehicleStayInventoryDto implements Dto {
     @ApiModelProperty(value = "备注")
     private String remarks;
 
+    @ApiModelProperty("定位")
+    private String address;
+
+    @ApiModelProperty("定位经纬度")
+    private String addressCode;
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryInfoVo.java

@@ -99,4 +99,10 @@ public class AppScmVehicleStayInventoryInfoVo implements Vo {
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
 
+    @ApiModelProperty("定位")
+    private String address;
+
+    @ApiModelProperty("定位经纬度")
+    private String addressCode;
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventory.java

@@ -76,5 +76,9 @@ public class ScmVehicleInventory extends BaseEntity {
     private String useOrgName; // 使用组织
     @ApiModelProperty("备注")
     private String remarks; // 使用组织
+    @ApiModelProperty("定位")
+    private String address;
+    @ApiModelProperty("定位经纬度")
+    private String addressCode;
 
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml

@@ -22,24 +22,24 @@
 
     <select id="getCarInspectedList"
             resultType="com.yxt.anrui.scm.api.scmvehicleexamine.AppScmVehicleExaminePageVo">
-        SELECT sve.sid              as inspectedSid,
-               sve.modelName        as model,
-               sve.vinNo            as vin,
-               sve.departureDate    as dispatchedDate,
-               sve.purchaseType,
-               sve.inspection       as inspectedName,
-               sve.inspectionDate   as inspectedDate,
-               sve.inspectionResult as inspectedType,
-               sve.saveStatus
+        SELECT sve.sid as inspectedSid,
+        sve.modelName as model,
+        sve.vinNo as vin,
+        sve.departureDate as dispatchedDate,
+        sve.purchaseType,
+        sve.inspection as inspectedName,
+        sve.inspectionDate as inspectedDate,
+        sve.inspectionResult as inspectedType,
+        sve.saveStatus
         FROM scm_vehicle_examine sve
         <where>
             ${ew.sqlSegment}
             <if test="names != '' and names != null">
                 and concat(sve.vinNo
-                  , sve.modelName
-                  , sve.purchaseType) LIKE concat('%'
-                  , #{names}
-                  , '%')
+                , sve.modelName
+                , sve.purchaseType) LIKE concat('%'
+                , #{names}
+                , '%')
             </if>
         </where>
         ORDER BY sve.createTime DESC
@@ -76,6 +76,7 @@
                sve.inspectionResult as `state`,
                sve.remarks,
                sve.address          as location,
+               sve.addressCode,
                sve.price,
                sve.modelDifferenceExplain,
                sve.guaranteeCardNo,
@@ -86,14 +87,14 @@
 
     <select id="selectCarInspectedList"
             resultType="com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExaminePageVo">
-        SELECT sve.sid              as inspectedSid,
-               sve.modelName        as model,
-               sve.vinNo            as vin,
-               sve.departureDate    as dispatchedDate,
-               sve.purchaseType,
-               sve.inspection       as inspectedName,
-               sve.inspectionDate   as inspectedDate,
-               sve.inspectionResult as inspectedType
+        SELECT sve.sid as inspectedSid,
+        sve.modelName as model,
+        sve.vinNo as vin,
+        sve.departureDate as dispatchedDate,
+        sve.purchaseType,
+        sve.inspection as inspectedName,
+        sve.inspectionDate as inspectedDate,
+        sve.inspectionResult as inspectedType
         FROM scm_vehicle_examine sve
         <where>
             ${ew.sqlSegment}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@@ -279,9 +279,13 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         String inventoryName = dto.getInventoryName();
         String inventoryState = dto.getInventoryState();
         String remarks = dto.getRemarks();
-        if ("不通过".equals(inventoryState) && StringUtils.isBlank(remarks)) {
+        if ("2".equals(inventoryState) && StringUtils.isBlank(remarks)) {
             return rb.setMsg("备注请填写不通过原因");
         }
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        if (simpleDateFormat.format(new Date()).equals(dto.getLastData())) {
+            return rb.setMsg("今日已盘车辆，请勿重复提交");
+        }
 //        if (StringUtils.isBlank(inventoryName)) {
 //            return rb.setMsg("请选择盘库人员");
 //        }
@@ -346,6 +350,8 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
             scmVehicleInventory.setInventoryDate(simpleDateFormat.format(new Date()));
             scmVehicleInventory.setInventorySid(dto.getLoginSid());
             scmVehicleInventory.setInventoryName(dto.getLoginName());
+            scmVehicleInventory.setAddress(dto.getAddress());
+            scmVehicleInventory.setAddressCode(dto.getAddressCode());
             boolean b = updateById(scmVehicleInventory);
             if (!b) {
                 return rb.setMsg("操作失败");

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryDetailedsVo.java

@@ -78,5 +78,11 @@ public class StayInventoryDetailedsVo implements Vo {
     @ApiModelProperty("见证材料")
     private List<String> images = new ArrayList<>();
 
+    @ApiModelProperty("定位")
+    private String address;
+
+    @ApiModelProperty("定位经纬度")
+    private String addressCode;
+
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryDto.java

@@ -74,4 +74,10 @@ public class StayInventoryDto implements Dto {
     @ApiModelProperty("见证材料")
     private List<String> images;
 
+    @ApiModelProperty("定位")
+    private String address;
+
+    @ApiModelProperty("定位经纬度")
+    private String addressCode;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryInfoVo.java

@@ -92,4 +92,10 @@ public class StayInventoryInfoVo implements Vo {
     @ApiModelProperty("见证材料")
     private List<String> images;
 
+    @ApiModelProperty("定位")
+    private String address;
+
+    @ApiModelProperty("定位经纬度")
+    private String addressCode;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/AppBaseModelModpriceFeign.java

@@ -64,6 +64,7 @@ import javax.validation.Valid;
 public interface AppBaseModelModpriceFeign {
 
     @ApiOperation("获取车型调车详情")
+    @ResponseBody
     @GetMapping("/getModelAdjust/{sid}")
     public ResultBean<ModelModpriceDetailVo> getModelAdjust(@PathVariable("sid") String sid);
 
@@ -71,22 +72,27 @@ public interface AppBaseModelModpriceFeign {
 
     @ApiOperation("提交车型调价流程")
     @PostMapping("/submitModelAdjustInfo")
+    @ResponseBody
     public ResultBean submitModelAdjustInfo(@Valid @RequestBody SubmitModelModPriceDto dto);
 
     @ApiOperation(value = "办理（同意）")
     @PutMapping("/agreeModelAdjustInfo")
+    @ResponseBody
     public ResultBean agreeModelAdjustInfo(@Valid @RequestBody ModelModPriceCompleteDto query);
 
     @ApiOperation(value = "驳回任务")
+    @ResponseBody
     @PutMapping(value = "/rejectModelAdjustInfo")
     public ResultBean rejectModelAdjustInfo(@Valid @RequestBody ModelModPriceTaskQuery query);
 
     @ApiOperation(value = "撤回流程")
     @PutMapping(value = "/recallModelAdjustInfo")
+    @ResponseBody
     public ResultBean recallModelAdjustInfo(@Valid @RequestBody ModelModPriceTaskQuery query);
 
     @ApiOperation(value = "终止任务")
     @PutMapping(value = "/stopModelAdjustInfo")
+    @ResponseBody
     public ResultBean stopModelAdjustInfo(@Valid @RequestBody ModelModPriceTaskQuery query);
 
     @ApiOperation("获取流程操作标题")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModPriceCompleteDto.java

@@ -16,7 +16,7 @@ public class ModelModPriceCompleteDto implements Dto {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
-    @NotBlank(message = "参数错误：orgSidPath")
+//    @NotBlank(message = "参数错误：orgSidPath")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExamineDetailsVo.java

@@ -56,6 +56,9 @@ public class AppExamineDetailsVo implements Vo {
     @ApiModelProperty("定位")
     private String location;
 
+    @ApiModelProperty("经纬度code")
+    private String addressCode;
+
     @ApiModelProperty("项目内容")
     private List<InspectionItemVo> inspectList;