修改上架记录显示接口

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);
                         }

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;
         /**