Merge remote-tracking branch 'origin/master'

2 years ago · f3d92bc5b5
10 changed files with 128 additions and 14 deletions
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java
@ -181,4 +181,6 @@ public class BaseVehicle extends BaseEntity {
    private String orgCode;
    @ApiModelProperty(value = "车辆型号")
    private String vehMark;
+    @ApiModelProperty(value = "公司入库日期")
+    private String orgPriceDate;
 }
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java
@ -154,4 +154,6 @@ public class BaseVehicleSelectVo implements Vo {
    private String supplierCode;
    @ApiModelProperty(value = "分公司code")
    private String orgCode;
+    @ApiModelProperty(value = "公司入库日期")
+    private String orgPriceDate;
 }
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java
@ -250,4 +250,6 @@ public class BaseVehicleVo implements Vo {
    private String trailerOrInstallDealPrice;
    @ApiModelProperty("总成交价")
    private String totalDealPrice;
+    @ApiModelProperty(value = "公司入库日期")
+    private String orgPriceDate;
 }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
@ -520,18 +520,14 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                            }
                        }
                        // 供应商:FSupplierId  (必填项)
-                        String vinNo = baseInternalPurchaseVehicles2.get(0).getVinNo();
-                        BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, callInOrgSid);
-                        if (baseVehicle != null) {
-                            String supplierSid = baseVehicle.getSupplierSid();
-                            BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(supplierSid);
-                            stkInStock.setFSupplierId(baseManufacturer.getManufacturerCode());
-                        }
+                        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallOutOrgSid()).getData();
+                        stkInStock.setFSupplierId(sysOrganizationVo.getOtherCode());
                        //stkInStock.setFSupplierId("010001");
                        // 物料列表:FInStockEntry  (必填项)
                        List<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>();
                        for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles2) {
                            StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry();
+                            String vinNo = baseInternalPurchaseVehicle.getVinNo();
                            //单价  目前放的是内销价  应该是厂家结算价 目前没有厂家结算价  需要后期修改为厂家结算价
                            sf.setFPrice(baseInternalPurchaseVehicle.getCostPrice() + "");
                            //车辆类型
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@ -1560,7 +1560,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
            //分公司
            if (org.apache.commons.lang3.StringUtils.isNotBlank(params.getOrgPath())) {
                String orgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
-                qw.eq("createOrgSid", orgSid);
+                qw.eq("bv.createOrgSid", orgSid);
            }
            //品牌
            if (StringUtils.isNotBlank(params.getBrandSid())) {
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
@ -211,6 +211,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
        if (StringUtils.isBlank(dto.getSid())) { // 新增
            ScmApplyInbound inboundVehicle = new ScmApplyInbound();
            BeanUtil.copyProperties(dto, inboundVehicle);
+            String billNo = getApplyCode(dto.getUserSid());
+            inboundVehicle.setApplicationCode(billNo);
            inboundVehicle.setSid(UUID.randomUUID().toString());
            inboundVehicle.setOrgSidPath(orgPath);
            save(inboundVehicle);
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java
@ -168,6 +168,15 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
        ScmApplyInboundQuery entity = fetchBySid(sid);
        ScmApplyInboundQueryDetailsVo vo = new ScmApplyInboundQueryDetailsVo();
        BeanUtil.copyProperties(entity, vo);
+        List<ScmApplyInboundVehQueryDetailsVo> scmApplyInboundVehQueryDetailsVos = scmApplyInboundVehQueryService.fetchByMainSid(sid);
+        vo.setScmApplyInboundVehQueryList(scmApplyInboundVehQueryDetailsVos);
+        BigDecimal totalMoney = new BigDecimal(0);
+        for (ScmApplyInboundVehQueryDetailsVo scmApplyInboundVehQueryDetailsVo : scmApplyInboundVehQueryDetailsVos) {
+            String settleMoney = scmApplyInboundVehQueryDetailsVo.getSettleMoney();
+            totalMoney = totalMoney.add(new BigDecimal(settleMoney));
+        }
+        String transform = TransformMoney.transform(totalMoney.toString());
+        vo.setTotalMoney(transform);
        return vo;
    }

@ -260,7 +269,7 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
            stkInStock.setFPurchaseDeptId(baseVehicle.getPurchaseSystemCode());
            stkInStock.setFSupplierId(baseVehicle.getSupplierCode());
            // 入库日期:FDate  (必填项)
-            stkInStock.setFDate(DateUtil.formatDate(baseVehicle.getPriceDate()));
+            stkInStock.setFDate(baseVehicle.getOrgPriceDate());
            // 物料列表:FInStockEntry  (必填项)
            List<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>();
            //直接调拨单的物料列表
--- 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
@ -467,7 +467,7 @@ export default {
          this.temp.customerSid = resp.data.customerSid
          this.temp.mobile = resp.data.mobile
          this.temp.giftsDescription = resp.data.totaldiscount
-          this.temp.salesAllowance = resp.data.carDiscountPrice
+          // this.temp.salesAllowance = resp.data.carDiscountPrice
          this.temp.middleOne = resp.data.intermediaryName
          this.temp.rebateMoneyOne = resp.data.distributorPrice
          this.temp.middleTwo = resp.data.intermediaryName2
--- a/anrui-scm/anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue
@ -347,11 +347,22 @@ export default {
        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行重推操作' })
        return
      } else {
+        const loading = this.$loading({
+          lock: true,
+          text: '数据推送中',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
        req.ctcgykd({ cgrkdSid: this.sids[0] }).then((resp) => {
          if (resp.success) {
+            loading.close()
            this.$message({ showClose: true, type: 'success', message: '推送成功' })
            this.getList()
+          } else {
+            loading.close()
          }
+        }).catch(() => {
+          loading.close()
        })
      }
    },
--- a/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangAdd.vue
@ -96,7 +96,10 @@
          <el-col :span="12">
            <div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
            <el-form-item>
-              <el-input v-model="formobj.tarpaulinSlide" placeholder="篷布滑道" class="addinputw addinputwOne" clearable/>
+              <el-select v-model="formobj.tarpaulinSlide" @change="changeTarpaulinSlide" class="addinputw addinputwOne" clearable @clear="clearTarpaulinSlide" filterable placeholder="请选择">
+                <el-option v-for="item in tarpaulinSlide_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                </el-option>
+              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
@ -110,13 +113,19 @@
          <el-col :span="12">
            <div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
            <el-form-item>
-              <el-input v-model="formobj.selfUnHyCoPl" placeholder="自卸液压盖板" class="addinputw addinputwOne" clearable/>
+              <el-select v-model="formobj.selfUnHyCoPl" @change="changeSelfUnHyCoPl" class="addinputw addinputwOne" filterable clearable @clear="clearSelfUnHyCoPl" placeholder="请选择">
+                <el-option v-for="item in selfUnHyCoPl_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                </el-option>
+              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <div class="span-sty spanOneWidth"><span>底板加热</span></div>
            <el-form-item>
-              <el-input v-model="formobj.floorHeating" placeholder="底板加热" class="addinputw addinputwOne" clearable/>
+              <el-select v-model="formobj.floorHeating" @change="changeFloorHeating" class="addinputw addinputwOne" filterable clearable @clear="clearFloorHeating" placeholder="请选择">
+                <el-option v-for="item in floorHeating_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                </el-option>
+              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
@ -148,6 +157,9 @@ export default {
      color_list: [],
      refitMethod_list: [],
      plateMaterial_list: [],
+      tarpaulinSlide_list: [],
+      selfUnHyCoPl_list: [],
+      floorHeating_list: [],
      refitFactory_list: [],
      formobj: {
        sid: '',
@ -168,9 +180,12 @@ export default {
        plateThicknessBottom: '',
        plateThicknessEdge: '',
        tarpaulinSlide: '',
+        tarpaulinSlideKey: '',
        refrigerator: '',
        selfUnHyCoPl: '',
+        selfUnHyCoPlKey: '',
        floorHeating: '',
+        floorHeatingKey: '',
        useOrgSid: '',
        createOrgSid: ''
      },
@ -225,6 +240,21 @@ export default {
          this.plateMaterial_list = res.data
        }
      })
+      typeValues({ type: 'sz_pbhd' }).then((res) => {
+        if (res.success) {
+          this.tarpaulinSlide_list = res.data
+        }
+      })
+      typeValues({ type: 'sz_zxyygb' }).then((res) => {
+        if (res.success) {
+          this.selfUnHyCoPl_list = res.data
+        }
+      })
+      typeValues({ type: 'sz_dbjr' }).then((res) => {
+        if (res.success) {
+          this.floorHeating_list = res.data
+        }
+      })
    },
    changeInstallName(value) {
      let bb = null
@ -295,9 +325,69 @@ export default {
      this.formobj.plateMaterialValue = bb.name
      this.formobj.plateMaterialKey = bb.key
    },
+    changeTarpaulinSlide(value) {
+      const choose = this.tarpaulinSlide_list.filter((item) => item.dictKey === value)
+      if (choose.length > 0) {
+        this.formobj.tarpaulinSlide = choose[0].dictValue
+        this.formobj.tarpaulinSlideKey = choose[0].dictKey
+      }
+    },
+    clearTarpaulinSlide() {
+      this.formobj.tarpaulinSlide = ''
+      this.formobj.tarpaulinSlideKey = ''
+    },
+    changeSelfUnHyCoPl(value) {
+      const choose = this.selfUnHyCoPl_list.filter((item) => item.dictKey === value)
+      if (choose.length > 0) {
+        this.formobj.selfUnHyCoPl = choose[0].dictValue
+        this.formobj.selfUnHyCoPlKey = choose[0].dictKey
+      }
+    },
+    clearSelfUnHyCoPl() {
+      this.formobj.selfUnHyCoPl = ''
+      this.formobj.selfUnHyCoPlKey = ''
+    },
+    changeFloorHeating(value) {
+      const choose = this.selfUnHyCoPl_list.filter((item) => item.dictKey === value)
+      if (choose.length > 0) {
+        this.formobj.floorHeating = choose[0].dictValue
+        this.formobj.floorHeatingKey = choose[0].dictKey
+      }
+    },
+    clearFloorHeating() {
+      this.formobj.floorHeating = ''
+      this.formobj.floorHeatingKey = ''
+    },
    handleReturn(isreload) {
      if (isreload === 'true') this.$emit('reloadlist')
-      this.formobj = {}
+      this.formobj = {
+        sid: '',
+        vehicleTypeKey: '',
+        vehicleTypeValue: '',
+        installNameKey: '',
+        installNameValue: '',
+        refitMethodKey: '',
+        refitMethodValue: '',
+        refitFactory: '',
+        colorKey: '',
+        colorValue: '',
+        wk_long: '',
+        wk_wide: '',
+        wk_high: '',
+        plateMaterialKey: '',
+        plateMaterialValue: '',
+        plateThicknessBottom: '',
+        plateThicknessEdge: '',
+        tarpaulinSlide: '',
+        tarpaulinSlideKey: '',
+        refrigerator: '',
+        selfUnHyCoPl: '',
+        selfUnHyCoPlKey: '',
+        floorHeating: '',
+        floorHeatingKey: '',
+        useOrgSid: '',
+        createOrgSid: ''
+      }
      this.$refs['form_obj'].resetFields()
      this.$emit('doback')
    },