diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index b944555371..e9f4a6f4ee 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -180,17 +180,26 @@ public class BaseVehicleOutService extends MybatisBaseService + + - - diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue index da9740b6e0..c4bdb67854 100644 --- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue +++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue @@ -304,14 +304,14 @@ + + - - diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/relation/changshangBankInfo.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/relation/changshangBankInfo.vue index 0bfb61a5d7..eedc30f223 100644 --- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/relation/changshangBankInfo.vue +++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/relation/changshangBankInfo.vue @@ -113,7 +113,7 @@ - 厂家销售通路 + 厂家回款通路 @@ -125,7 +125,7 @@ - 付款通路编码 + 付款通路 diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java index 94a16cc473..2c2120c319 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java @@ -91,9 +91,9 @@ public class StkTransferDirect { //public String FUnitID; } /* 调入货主:FOwnerIdHead (必填项)*/ - @JsonProperty("FOwnerIdHead") + /* @JsonProperty("FOwnerIdHead") @NotBlank(message = "FOwnerIdHead不能为空") - public String FOwnerIdHead; + public String FOwnerIdHead;*/ /* 调出库存组织:FStockOutOrgId (必填项)*/ @JsonProperty("FStockOutOrgId") @NotBlank(message = "FStockOutOrgId不能为空") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialCastToKingDeeBillFields.java index c1730443b6..d9f7c2d9f7 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialCastToKingDeeBillFields.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialCastToKingDeeBillFields.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.parser.Feature; import com.yxt.anrui.fin.biz.kingdee.KingDeeUtils; +import com.yxt.common.base.utils.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,7 +43,13 @@ public class BdMaterialCastToKingDeeBillFields { fEntityModel_ =KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_); JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField); - + String fields = map_fEntityModel_.get("fields"); + if(StringUtils.isBlank(fields)){ + jsonFEntityData_.put("NeedUpDateFields",JSONArray.parseArray(JSON.toJSONString(new ArrayList<>()))); + }else{ + String[] split = fields.split(","); + jsonFEntityData_.put("NeedUpDateFields",JSONArray.parseArray(JSON.toJSONString(split))); + } jsonFEntityData_.put("Model",JSONObject.parseObject(JSON.toJSONString(jsonFEntityModel_),Feature.OrderedField)); jsonObj.put("data",jsonFEntityData_.toJSONString()); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java index 9862563ed0..88c1f72094 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java @@ -1,6 +1,8 @@ package com.yxt.anrui.fin.biz.kingdee.bdmaterial; import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.yxt.anrui.fin.api.kingdee.KingDeeBillId; import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl; @@ -115,6 +117,7 @@ public class BdMaterialService extends FinKingDeeService { return stringResultBean1; } map_fEntityModel_.put("IsDeleteEntry","False"); + map_fEntityModel_.put("fields","FName,FNumber,FMaterialGroup,F_PAEZ_Base"); map_fEntityModel_.put("FMATERIALID",FMATERIALID); rb= saveBdMaterial(map_fEntityModel_); if (rb.getSuccess()) { diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index d340fe09b9..fa2b397674 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java @@ -168,8 +168,10 @@ public class SysOrganizationRest implements SysOrganizationFeign { if(!orgList.contains(orgSid1)){ //根据staffSid查询token String token = sysUserService.selectByStaffsid(s).getToken(); - //清空该token - redisUtil.remove(token); + if(StringUtils.isNotBlank(token)){ + //清空该token + redisUtil.remove(token); + } } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java index 895d6c4feb..037d5e77a0 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java @@ -332,7 +332,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService resultBean = finKingDeeFeign.draftStkTransferDirect(stkTransferDirect); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index 1677531a0f..b6e6e0ceb9 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -909,10 +909,10 @@ public class ScmVehicleGressionService extends MybatisBaseService - + diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue index 3fd4ca00ef..2d77a3f3b3 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue @@ -6,28 +6,230 @@
{{ searchxianshitit }} diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue index 21e636df9b..f29663f397 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue @@ -229,6 +229,7 @@ export default { staffSid: '', // 销售专员sid type: '', // 出库类型 typeKey: '', // 出库类型Key + createOrgSid: '' }, payType_list: [], // 出库类型 org_list: [], // 销售部门 @@ -318,19 +319,27 @@ export default { this.temp.middleTwoSid = choosetItem[0].middleSid this.temp.middleCodeTwo = choosetItem[0].middleCode }, - showChu(multipleSelection) { + showChu(multipleSelection, createOrgSid) { this.temp.vinNo = multipleSelection[0].vinNo this.temp.vinSid = multipleSelection[0].sid + this.temp.createOrgSid = createOrgSid this.getType() }, // 保存 handleCreate() { - vehicleOutLibrary(this.temp).then((response) => { - if (response.success) { - this.$message({ showClose: true, type: 'success', message: '保存成功' }) - this.handleReturn('true') - } - }).catch(e => { + const tip = '请确认是否临时出库?' + this.$confirm(tip, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + vehicleOutLibrary(this.temp).then((response) => { + if (response.success) { + this.$message({ showClose: true, type: 'success', message: '保存成功' }) + this.handleReturn('true') + } + }).catch(e => { + }) }) }, // 返回 diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue index b8cd2e2ce6..538d171678 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue @@ -152,7 +152,7 @@ import { pagerList } from '@/api/cheliang/cheliangxiaoshou' import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' import ButtonBar from '@/components/ButtonBar' -import { typeValues } from '@/api/cheliang/dictcommons' +import { typeValues, getPathSidByUserSid } from '@/api/cheliang/dictcommons' import chelaingxiaoshouInfo from './chelaingxiaoshouInfo' export default { @@ -191,7 +191,8 @@ export default { saleDateEnd: '', saleDateStart: '', typeKey: '', - vinNo: '' + vinNo: '', + createOrgSid: '' }, current: 1, size: 5, @@ -202,7 +203,6 @@ export default { }, created() { // 加载列表 - this.getList() this.init() }, mounted() { @@ -215,6 +215,12 @@ export default { this.payType_list = res.data } }) + getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => { + if (resp.success) { + this.listQuery.params.createOrgSid = resp.data + this.getList() + } + }) }, // 搜索条件效果 clicksearchShow() { @@ -269,13 +275,14 @@ export default { saleDateEnd: '', saleDateStart: '', typeKey: '', - vinNo: '' + vinNo: '', + createOrgSid: '' }, current: 1, size: 5, total: 0 } - this.getList() + this.init() }, toInfo(row) { this.viewState = 2 diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue index 3cdcbf7078..128cdc3776 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue @@ -147,6 +147,11 @@ {{ scope.row.manufactorSettlementPrice }} + + +