Merge remote-tracking branch 'origin/master'

3 months ago · ee02dbf4b5
5 changed files with 36 additions and 16 deletions
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java
@ -54,9 +54,9 @@ public class AppIndexEnum {
        JFKC("a204a3fa-c8ac-4795-966c-df1d0e131bcf", "家访考察"),
        FKZLSC("65dc12e0-9213-4364-ae81-18afa9c7e1ee", "放款资料上传"),
        DYBL("ab7df5a0-9708-48b1-b58a-60d7e024d0a2", "抵押办理"),
-        WXWB("c3a6be91-3e95-4520-b5a7-c805d8f187d7", "维修完毕-售后"),
-        SPSJ("781ce38b-b003-4efd-accf-fbee0ca33091", "商品上架-售后"),
-        PJJS("37905444-5454-4b08-897d-6c2c089c317d", "配件接收-售后"),
+        WXWB("c3a6be91-3e95-4520-b5a7-c805d8f187d7", "维修完毕"),
+        SPSJ("781ce38b-b003-4efd-accf-fbee0ca33091", "商品上架"),
+        PJJS("37905444-5454-4b08-897d-6c2c089c317d", "配件接收"),
        ;

        /**
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
@ -41,7 +41,9 @@
                <el-date-picker v-model="listQuery.params.uploadEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
              </el-form-item>
              <el-form-item label="返利类型">
-                <el-input v-model="listQuery.params.rebateTypeValue" placeholder="" clearable/>
+                <el-select v-model="listQuery.params.rebateTypeValue" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in rebateType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                </el-select>
              </el-form-item>
              <el-form-item label="返利名称">
                <el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
@ -417,7 +419,7 @@ import ButtonBar from '@/components/ButtonBar'
 import bicyclerebatecheck from './bicyclerebatecheck'
 import bicyclerebatecheckAdd from './bicyclerebatecheckAdd'
 import bicyclerebatetobecheckedByUpdate from './bicyclerebatetobecheckedByUpdate'
-import { getOrgSidByPath } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath, getTypeValueList } from '@/api/cheliang/dictcommons'

 export default {
  name: 'BicycleRebateToBeChecked',
@ -457,6 +459,7 @@ export default {
      listAll: [],
      sids: [],
      FormLoading: false,
+      rebateType_list: [],
      state_list: [
        {
          dictKey: '0',
@ -562,6 +565,11 @@ export default {
  },
  methods: {
    init() {
+      getTypeValueList({ type: 'rebateType', groupNum: 'DC' }).then((res) => {
+        if (res.success) {
+          this.rebateType_list = res.data
+        }
+      })
      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
        if (resp.success) {
          this.listQuery.params.createOrgSid = resp.data
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
@ -400,7 +400,7 @@ import ButtonBar from '@/components/ButtonBar'
 import specialrebatecheck from './specialrebatecheck'
 import specialrebatecheckAdd from './specialrebatecheckAdd'
 import specialrebatetobecheckedByUpdate from './specialrebatetobecheckedByUpdate'
-import { getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath, getTypeValueList } from '@/api/cheliang/dictcommons'

 export default {
  name: 'SpecialRebateToBeChecked',
@ -552,7 +552,7 @@ export default {
  },
  methods: {
    init() {
-      typeValues({ type: 'rebateType' }).then((res) => {
+      getTypeValueList({ type: 'rebateType', groupNum: 'ZX' }).then((res) => {
        if (res.success) {
          this.rebateType_list = res.data
        }
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java
@ -121,6 +121,7 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
    private BaseGoodsSkuExtendFeign baseGoodsSkuExtendFeign;
    @Autowired
    private SmsGoodsFeign smsGoodsFeign;
+
    public PagerVo<WmsShelfBillVo> listPage(PagerQuery<WmsShelfBillQuery> pq) {
        WmsShelfBillQuery query = pq.getParams();
        QueryWrapper<WmsShelfBill> qw = new QueryWrapper<>();
@ -855,7 +856,7 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                if (StringUtils.isNotBlank(tjmxSid)) {
                    List<SmsPricestrategyBillGoodstypedetailDetailsVo> data = smsPricesTrategyBillGoodsTypeDetailFeign.selByMainSid(tjmxSid).getData();
                    for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : data) {
-                         cost = receiptBillDetail.getCost();
+                        cost = receiptBillDetail.getCost();
                        if (cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) {
                            BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate();
                            price = cost.add(cost.multiply(markupRate).divide(new BigDecimal("100")));
@ -958,15 +959,26 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                        for (WmsInventoryRecord inventoryRecord : wmsInventoryRecordList) {
                            AppRecordListVo.AppRecordListDetailsDto detailsDto = new AppRecordListVo.AppRecordListDetailsDto();
                            detailsDto.setGoodsID(inventoryRecord.getGoodsID());
+                            WmsHouseInfoVo infoVo = wmsWarehouseRackService.selHouseInfoByFullCode(inventoryRecord.getWarehouseRackSid()).getData();
                            String houseName = "";
-                            String rockCode = "";
-                            if (StringUtils.isNotBlank(inventoryRecord.getWarehouseName())) {
-                                houseName = inventoryRecord.getWarehouseName();
-                            }
-                            if (StringUtils.isNotBlank(inventoryRecord.getWarehouseRackCode())) {
-                                rockCode = inventoryRecord.getWarehouseRackCode();
+                            String areaName = "";
+                            String rackCode = "";
+                            String zoneName = "";
+                            if (null != infoVo) {
+                                if (StringUtils.isNotBlank(infoVo.getWarehouseName())) {
+                                    houseName = infoVo.getWarehouseName();
+                                }
+                                if (StringUtils.isNotBlank(infoVo.getWareAreaName())) {
+                                    areaName = infoVo.getWareAreaName();
+                                }
+                                if (StringUtils.isNotBlank(infoVo.getWarehouseRackCode())) {
+                                    rackCode = infoVo.getWarehouseRackCode();
+                                }
+                                if (StringUtils.isNotBlank(infoVo.getWarehouseZoneName())) {
+                                    zoneName = infoVo.getWarehouseZoneName();
+                                }
+                                detailsDto.setHouseName(houseName + "-" + zoneName + "-" + areaName + " " + rackCode);
                            }
-                            detailsDto.setHouseName(houseName + rockCode);
                            detailsDto.setShows(inventoryRecord.getHandlerName() + "于" + sdf.format(inventoryRecord.getCreateTime()) + "上架" + inventoryRecord.getCount().intValue() + inventoryRecord.getUnit());
                            detailsList.add(detailsDto);
                        }
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/app/AppRecordListVo.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/app/AppRecordListVo.java
@ -23,7 +23,7 @@ public class AppRecordListVo {
         */
        private String goodsID;
        /**
-         * 库位 库区名+库位码
+         * 仓库-区域-库区 库位码
         */
        private String houseName;
        /**