From 09ef1a21c703f3891d0ac2bceeb7d4ee5e6a2be4 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 4 Nov 2024 15:33:39 +0800
Subject: [PATCH] 11.4

---
 .../warehouse/apiadmin/WarehouseInfoRest.java |  5 +
 .../warehouseinfo/WarehouseInfoMapper.java    |  1 +
 .../biz/warehouseinfo/WarehouseInfoMapper.xml |  6 ++
 .../warehouseinfo/WarehouseInfoService.java   | 92 +++++++++++++------
 4 files changed, 77 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java
index b07624a..15d2715 100644
--- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java
+++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java
@@ -37,6 +37,11 @@ public class WarehouseInfoRest {
     public ResultBean<List<ProjectDetailsVo>> list(@RequestBody WarehouseInfoMapQuery query) {
         return  wmsWarehouseService.listQuery(query);
     }
+    @GetMapping("/getWarehouseBySid/{sid}")
+    public ResultBean<ProjectDetailsVo> getWarehouseBySid(@PathVariable("sid") String sid) {
+        return  wmsWarehouseService.getWarehouseBySid(sid);
+    }
+
     @PostMapping("/listPageN")
     public ResultBean<PagerVo<ProjectDetailsVo>> listPageN(@RequestBody PagerQuery<WarehouseInfoMapQuery> query) {
         return  wmsWarehouseService.listPage1(query);
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java
index eaf5a41..d5dd469 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java
@@ -19,6 +19,7 @@ import java.util.List;
 public interface WarehouseInfoMapper extends BaseMapper<WarehouseInfo> {
     IPage<WarehouseInfoVo> listPage(IPage<WarehouseInfo> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInfo> qw);
     List<ProjectDetailsVo> listQuery( @Param(Constants.WRAPPER) QueryWrapper<WarehouseInfo> qw);
+    ProjectDetailsVo getWarehouseBySid( @Param("sid") String sid);
     IPage<ProjectDetailsVo> listQuery1( IPage<ProjectDetailsVo> page,@Param(Constants.WRAPPER) QueryWrapper<WarehouseInfo> qw);
 
     int updateBySidIsDelete(List<String> list);
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml
index f9ae5a3..6b05e84 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml
@@ -22,6 +22,12 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="getWarehouseBySid" resultType="com.yxt.warehouse.biz.warehouseinfo.ProjectDetailsVo">
+        select
+        a.*
+        from warehouse_info a
+        where a.sid=#{sid}
+    </select>
     <select id="listQuery1" resultType="com.yxt.warehouse.biz.warehouseinfo.ProjectDetailsVo">
         select
         a.*
diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
index 40769ef..9f1ef3e 100644
--- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
+++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
@@ -111,33 +111,33 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
         }
         List<ProjectDetailsVo> storeInfos = baseMapper.listQuery(qw);
         for (ProjectDetailsVo storeInfo : storeInfos) {
-            List<WarehouseInventory> warehouseInventories=warehouseInventoryService.list(new QueryWrapper<WarehouseInventory>().eq("warehouseSid",storeInfo.getSid()));
-            if (warehouseInventories.size()!=0){
-                List<WarehouseInventoryRecord> list=warehouseInventoryRecordService.list(new QueryWrapper<WarehouseInventoryRecord>()
-                        .eq("inventorySid",warehouseInventories.get(0).getSid()).eq("billType","1"));
-                if(list.size()!=0){
-                    storeInfo.setSupplierName(list.get(0).getBillObjName());
-                    List<PurchaseInventoryBillDetail>details=purchaseInventoryBillDetailService.list(new QueryWrapper<PurchaseInventoryBillDetail>()
-                            .eq("sourceBillSid",list.get(0).getSourceBillSid()));
-                    for (PurchaseInventoryBillDetail detail : details) {
-                        if(StringUtils.isBlank(storeInfo.getGoodsDetail())){
-                            Double s=detail.getCount();
-                            if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){
-                                storeInfo.setGoodsDetail(detail.getGoodsSkuTitle()+":"+ DoubleUtils.removeZeros(s.toString())+detail.getUnit());
-                            }else{
-                                storeInfo.setGoodsDetail(detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit());
-                            }
-                        }else{
-                            Double s=detail.getCount();
-                            if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){
-                                storeInfo.setGoodsDetail(","+detail.getGoodsSkuTitle()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit());
-                            }else{
-                                storeInfo.setGoodsDetail(","+detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit());
-                            }
-                        }
-                    }
-                }
-            }
+//            List<WarehouseInventory> warehouseInventories=warehouseInventoryService.list(new QueryWrapper<WarehouseInventory>().eq("warehouseSid",storeInfo.getSid()));
+//            if (warehouseInventories.size()!=0){
+//                List<WarehouseInventoryRecord> list=warehouseInventoryRecordService.list(new QueryWrapper<WarehouseInventoryRecord>()
+//                        .eq("inventorySid",warehouseInventories.get(0).getSid()).eq("billType","1"));
+//                if(list.size()!=0){
+//                    storeInfo.setSupplierName(list.get(0).getBillObjName());
+//                    List<PurchaseInventoryBillDetail>details=purchaseInventoryBillDetailService.list(new QueryWrapper<PurchaseInventoryBillDetail>()
+//                            .eq("sourceBillSid",list.get(0).getSourceBillSid()));
+//                    for (PurchaseInventoryBillDetail detail : details) {
+//                        if(StringUtils.isBlank(storeInfo.getGoodsDetail())){
+//                            Double s=detail.getCount();
+//                            if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){
+//                                storeInfo.setGoodsDetail(detail.getGoodsSkuTitle()+":"+ DoubleUtils.removeZeros(s.toString())+detail.getUnit());
+//                            }else{
+//                                storeInfo.setGoodsDetail(detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit());
+//                            }
+//                        }else{
+//                            Double s=detail.getCount();
+//                            if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){
+//                                storeInfo.setGoodsDetail(","+detail.getGoodsSkuTitle()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit());
+//                            }else{
+//                                storeInfo.setGoodsDetail(","+detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit());
+//                            }
+//                        }
+//                    }
+//                }
+//            }
             if(StringUtils.isNotBlank(storeInfo.getLngAndLat())){
                 String []w=storeInfo.getLngAndLat().split(",");
                 storeInfo.setLatitude(w[1]);
@@ -146,6 +146,44 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
         }
         return rb.success().setData(storeInfos);
     }
+    public ResultBean<ProjectDetailsVo> getWarehouseBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+
+        ProjectDetailsVo storeInfo = baseMapper.getWarehouseBySid(sid);
+        List<WarehouseInventory> warehouseInventories=warehouseInventoryService.list(new QueryWrapper<WarehouseInventory>().eq("warehouseSid",storeInfo.getSid()));
+        if (warehouseInventories.size()!=0){
+            List<WarehouseInventoryRecord> list=warehouseInventoryRecordService.list(new QueryWrapper<WarehouseInventoryRecord>()
+                    .eq("inventorySid",warehouseInventories.get(0).getSid()).eq("billType","1"));
+            if(list.size()!=0){
+                storeInfo.setSupplierName(list.get(0).getBillObjName());
+                List<PurchaseInventoryBillDetail>details=purchaseInventoryBillDetailService.list(new QueryWrapper<PurchaseInventoryBillDetail>()
+                        .eq("sourceBillSid",list.get(0).getSourceBillSid()));
+                for (PurchaseInventoryBillDetail detail : details) {
+                    if(StringUtils.isBlank(storeInfo.getGoodsDetail())){
+                        Double s=detail.getCount();
+                        if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){
+                            storeInfo.setGoodsDetail(detail.getGoodsSkuTitle()+":"+ DoubleUtils.removeZeros(s.toString())+detail.getUnit());
+                        }else{
+                            storeInfo.setGoodsDetail(detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit());
+                        }
+                    }else{
+                        Double s=detail.getCount();
+                        if(StringUtils.isNotBlank(detail.getGoodsSkuTitle())){
+                            storeInfo.setGoodsDetail(","+detail.getGoodsSkuTitle()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit());
+                        }else{
+                            storeInfo.setGoodsDetail(","+detail.getGoodsSkuCode()+":"+DoubleUtils.removeZeros(s.toString())+detail.getUnit());
+                        }
+                    }
+                }
+            }
+        }
+        if(StringUtils.isNotBlank(storeInfo.getLngAndLat())){
+            String []w=storeInfo.getLngAndLat().split(",");
+            storeInfo.setLatitude(w[1]);
+            storeInfo.setLongitude(w[0]);
+        }
+        return rb.success().setData(storeInfo);
+    }
     public ResultBean<PagerVo<ProjectDetailsVo>> listPage1(PagerQuery<WarehouseInfoMapQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         WarehouseInfoMapQuery query = pq.getParams();