Merge remote-tracking branch 'origin/master'

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

@@ -364,7 +364,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             for (BaseInternalPurchaseVehicleDto baseInternalPurchaseVehicleDto : baseInternalPurchaseVehicles) {
-                BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(baseInternalPurchaseVehicleDto.getVinNo(),baseInternalPurchase.getCreateOrgSid());
+                BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(baseInternalPurchaseVehicleDto.getVinNo(),baseInternalPurchase1.getCreateOrgSid());
                 baseVehicle.setVinNo(baseInternalPurchaseVehicleDto.getVinNo());
                 baseVehicle.setVehicleState(VehicleState.StockEnum.DCZ_STOCK.getCode());
                 baseVehicle.setVehicleStateValue(VehicleState.StockEnum.DCZ_STOCK.getRemarks());
@@ -614,6 +614,16 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             bv.setNextNodeUserSids(substring);
         }
         if (shuntingTypeValue.equals("调出")) {
+            List<Map<String, Object>> l = ConstantUtils.getListData(bv.getFormVariables(), "baseInternalPurchaseVehicles");
+            for (int i = 0; i < l.size(); i++) {
+                Map<String, Object> map = l.get(i);
+                String sid = map.get("sid").toString();
+                String guidedPrice = map.get("guidedPrice").toString();
+                if (StringUtils.isBlank(guidedPrice)) {
+                    return rb.setMsg("请填写销售指导价");
+                }
+                baseInternalPurchaseVehicleService.updateGuidedPriceBySid(sid, guidedPrice);
+            }
             String callInOrgSid = baseInternalPurchase.getBuyerOrgSid();
             ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
             //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryDetailsVo.java

@@ -26,12 +26,16 @@
 package com.yxt.anrui.scm.api.scmapplyinboundquery;
 
 
+import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDetailsVo;
+import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-scm(车辆入库单查询) <br/>
  * File: ScmApplyInboundQueryVo.java <br/>
@@ -97,5 +101,6 @@ public class ScmApplyInboundQueryDetailsVo implements Vo {
     private String downNum; // 下载次数
 	@ApiModelProperty("最新下载时间")
     private String newDownDate; // 最新下载时间
-
+    @ApiModelProperty("入库查询车辆列表")
+    private List<ScmApplyInboundVehQueryDetailsVo> scmApplyInboundVehQueryList; // 入库查询车辆列表
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryQuery.java

@@ -49,51 +49,20 @@ import lombok.Data;
 @ApiModel(value = "车辆入库单查询 查询条件", description = "车辆入库单查询 查询条件")
 public class ScmApplyInboundQueryQuery implements Query {
 
-	@ApiModelProperty("公司入库日期")
-    private String orgPriceDate; // 公司入库日期
-	@ApiModelProperty("采购类型key")
-    private String manPurOrderTypeKey; // 采购类型key
-	@ApiModelProperty("采购类型value")
-    private String manPurOrderTypeValue; // 采购类型value
-	@ApiModelProperty("业务单据编号")
+    @ApiModelProperty("业务单据编号")
     private String applicationCode; // 业务单据编号
-	@ApiModelProperty("部门sid")
+    @ApiModelProperty("采购类型key")
+    private String manPurOrderTypeKey; // 采购类型key
+	@ApiModelProperty("公司入库开始日期")
+    private String orgPriceStartDate; // 公司入库开始日期
+    @ApiModelProperty("公司入库结束日期")
+    private String orgPriceEndDate; // 公司入库结束日期
+    @ApiModelProperty("部门sid")
     private String orgDeptSid; // 部门sid
-	@ApiModelProperty("部门名称")
-    private String orgDeptName; // 部门名称
-	@ApiModelProperty("采购系统名称")
-    private String purchaseSystemName; // 采购系统名称
-	@ApiModelProperty("财务中分公司编码")
-    private String orgCode; // 财务中分公司编码
-	@ApiModelProperty("供应商sid")
+    @ApiModelProperty("供应商sid")
     private String manSid; // 供应商sid
-	@ApiModelProperty("供应商编码")
-    private String manCode; // 供应商编码
-	@ApiModelProperty("供应商名称")
-    private String manName; // 供应商名称
-	@ApiModelProperty("金额合计")
-    private String totalMoney; // 金额合计
-	@ApiModelProperty("制单人sid")
-    private String makeListSid; // 制单人sid
-	@ApiModelProperty("制单人姓名")
+    @ApiModelProperty("制单人姓名")
     private String makeListName; // 制单人姓名
-	@ApiModelProperty("制单日期")
-    private String makeListDate; // 制单日期
-	@ApiModelProperty("审核人sid")
-    private String confirmSid; // 审核人sid
-	@ApiModelProperty("审核人姓名")
-    private String confirmName; // 审核人姓名
-	@ApiModelProperty("审核日期")
-    private String confirmDate; // 审核日期
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-	@ApiModelProperty("创建组织名称")
-    private String createOrgName; // 创建组织名称
-	@ApiModelProperty("业务sid")
-    private String busSid; // 业务sid
-	@ApiModelProperty("下载次数")
-    private String downNum; // 下载次数
-	@ApiModelProperty("最新下载时间")
-    private String newDownDate; // 最新下载时间
-
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundquery/ScmApplyInboundQueryVo.java

@@ -51,51 +51,22 @@ public class ScmApplyInboundQueryVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("业务单据编号")
+    private String applicationCode; // 业务单据编号
 	@ApiModelProperty("公司入库日期")
     private String orgPriceDate; // 公司入库日期
-	@ApiModelProperty("采购类型key")
-    private String manPurOrderTypeKey; // 采购类型key
 	@ApiModelProperty("采购类型value")
     private String manPurOrderTypeValue; // 采购类型value
-	@ApiModelProperty("业务单据编号")
-    private String applicationCode; // 业务单据编号
-	@ApiModelProperty("部门sid")
-    private String orgDeptSid; // 部门sid
 	@ApiModelProperty("部门名称")
     private String orgDeptName; // 部门名称
+    @ApiModelProperty("供应商名称")
+    private String manName; // 供应商名称
 	@ApiModelProperty("采购系统名称")
     private String purchaseSystemName; // 采购系统名称
-	@ApiModelProperty("财务中分公司编码")
-    private String orgCode; // 财务中分公司编码
-	@ApiModelProperty("供应商sid")
-    private String manSid; // 供应商sid
-	@ApiModelProperty("供应商编码")
-    private String manCode; // 供应商编码
-	@ApiModelProperty("供应商名称")
-    private String manName; // 供应商名称
-	@ApiModelProperty("金额合计")
-    private String totalMoney; // 金额合计
-	@ApiModelProperty("制单人sid")
-    private String makeListSid; // 制单人sid
-	@ApiModelProperty("制单人姓名")
+    @ApiModelProperty("制单人姓名")
     private String makeListName; // 制单人姓名
-	@ApiModelProperty("制单日期")
-    private String makeListDate; // 制单日期
-	@ApiModelProperty("审核人sid")
-    private String confirmSid; // 审核人sid
-	@ApiModelProperty("审核人姓名")
-    private String confirmName; // 审核人姓名
-	@ApiModelProperty("审核日期")
-    private String confirmDate; // 审核日期
-	@ApiModelProperty("创建组织sid")
-    private String createOrgSid; // 创建组织sid
-	@ApiModelProperty("创建组织名称")
-    private String createOrgName; // 创建组织名称
-	@ApiModelProperty("业务sid")
-    private String busSid; // 业务sid
 	@ApiModelProperty("下载次数")
     private String downNum; // 下载次数
 	@ApiModelProperty("最新下载时间")
     private String newDownDate; // 最新下载时间
-
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryRest.java

@@ -77,7 +77,7 @@ public class ScmApplyInboundQueryRest implements ScmApplyInboundQueryFeign {
 
 	@Override
 	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
+    @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
 		ResultBean rb = ResultBean.fireFail();
 		scmApplyInboundQueryService.delBySids(sids);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java

@@ -82,7 +82,23 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
 	
 	public PagerVo<ScmApplyInboundQueryVo> listPageVo(PagerQuery<ScmApplyInboundQueryQuery> pq) {
 		ScmApplyInboundQueryQuery query = pq.getParams();
-		QueryWrapper<ScmApplyInboundQuery> qw = createQueryWrapper(query);
+		QueryWrapper<ScmApplyInboundQuery> qw = new QueryWrapper<>();
+		if (StringUtils.isNotBlank(query.getApplicationCode())){
+			qw.like("applicationCode",query.getApplicationCode());
+		}
+		if (StringUtils.isNotBlank(query.getManPurOrderTypeKey())){
+			qw.eq("manPurOrderTypeKey",query.getManPurOrderTypeKey());
+		}
+		if (StringUtils.isNotBlank(query.getOrgDeptSid())){
+			qw.eq("orgDeptSid",query.getOrgDeptSid());
+		}
+		if (StringUtils.isNotBlank(query.getManSid())){
+			qw.eq("manSid",query.getManSid());
+		}
+		if (StringUtils.isNotBlank(query.getMakeListName())){
+			qw.like("makeListName",query.getMakeListName());
+		}
+		qw.eq("createOrgSid",query.getCreateOrgSid());
 		IPage<ScmApplyInboundQuery> page = PagerUtil.queryToPage(pq);
 		IPage<ScmApplyInboundQueryVo> pagging = baseMapper.selectPageVo(page, qw);
 		PagerVo<ScmApplyInboundQueryVo> p = PagerUtil.pageToVo(pagging, null);

anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue

@@ -94,7 +94,7 @@
 
 <script>
 import req from '@/api/anruiscm/scmwarehouse'
-import { typeValues, getGressionUserList, getOrgSidByPath } from '@/api/cheliang/dictcommons'
+import { typeValues, getGressionUserList, getOrgSidByPath, fetchBySid } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'ScmWarehouseAdd',
@@ -163,7 +163,11 @@ export default {
     getUseOrg() {
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
-          this.formobj.useOrg = res.data // 使用组织
+          fetchBySid(res.data).then((resp) => {
+            if (resp.success) {
+              this.formobj.useOrg = res.data.name // 使用组织
+            }
+          })
           this.formobj.useOrgSid = res.data // 使用组织sid
         }
       })

anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByVinNoInfo.vue

@@ -285,7 +285,7 @@ export default {
     handleAgree() {
       this.linkByParameter.comment = this.dialogList.comment
       this.linkByParameter.formVariables = this.formobj
-      req.complete(this.linkByParameter).then((response) => {
+      req.InitiatorToAnswer(this.linkByParameter).then((response) => {
         if (response.success) {
           this.$notify({
             title: '提示',