Merge remote-tracking branch 'origin/master'

src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java

@@ -77,4 +77,10 @@ public class WarehouseInfoRest {
         List<WarehouseAreaAllVo> wmsWarehouseAreaAllVos = wmsWarehouseService.selectAll();
         return rb.success().setData(wmsWarehouseAreaAllVos);
     }
+
+    @ApiOperation("订单选择仓库")
+    @PostMapping("/getWareHouse")
+    public ResultBean<List<SmsOrderHouseInfo>> getWareHouse(@RequestParam("createOrgSid") String createOrgSid) {
+        return wmsWarehouseService.getWareHouse(createOrgSid);
+    }
 }

src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRest.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.util.List;
 
@@ -31,6 +32,7 @@ public class WarehouseInventoryRest {
 
 
 
+
     @ApiOperation("分页列表")
     @PostMapping("/listPage")
     public ResultBean<PagerVo<WarehouseInventoryVo>> listPage(@RequestBody PagerQuery<WarehouseInventoryQuery> pq) {
@@ -185,4 +187,9 @@ public class WarehouseInventoryRest {
         return WarehouseInventoryService.fetchEntityBySid(sid);
     }
 
+    @ApiOperation("根据skuSid查询商品库存")
+    @PostMapping("/selInventoryCountBySkuSid")
+    public String selInventoryCountBySkuSid(@RequestParam("skuSid") String skuSid) {
+        return WarehouseInventoryService.selInventoryCountBySkuSid(skuSid);
+    }
 }

src/main/java/com/yxt/warehouse/biz/warehouseinfo/SmsOrderHouseInfo.java

@@ -0,0 +1,27 @@
+package com.yxt.warehouse.biz.warehouseinfo;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/22 8:54
+ */
+@Data
+public class SmsOrderHouseInfo {
+
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+    /**
+     * 仓库sid
+     */
+    private String warehouseSid;
+
+
+    List<SmsOrderRock> houseRock = new ArrayList<>();
+}

src/main/java/com/yxt/warehouse/biz/warehouseinfo/SmsOrderRock.java

@@ -0,0 +1,23 @@
+package com.yxt.warehouse.biz.warehouseinfo;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/22 8:54
+ */
+@Data
+public class SmsOrderRock {
+
+
+    /**
+     * 货位编码
+     */
+    private String warehouseRackCode;
+    /**
+     * 货位sid
+     */
+    private String warehouseRackSid;
+
+}

src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java

@@ -23,4 +23,8 @@ public interface WarehouseInfoMapper extends BaseMapper<WarehouseInfo> {
     @Select("select * from wms_warehouse_info")
     List<WarehouseAreaAllVo> selectAll();
     List<WarehouseInfoVo> listAll(@Param("orgPath")String orgPath);
+
+    List<SmsOrderHouseInfo> getWareHouse(@Param("createOrgSid") String createOrgSid);
+
+    List<SmsOrderRock> getHouseRock(@Param("warehouseSid") String warehouseSid);
 }

src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.xml

@@ -22,6 +22,20 @@
             s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'  and a.isEnable ='1'
         </where>
     </select>
+    <select id="getWareHouse" resultType="com.yxt.warehouse.biz.warehouseinfo.SmsOrderHouseInfo">
+        select
+            sid as warehouseSid,
+            warehouseName
+        from warehouse_info
+        where createOrgSid =#{createOrgSid}
+    </select>
+    <select id="getHouseRock" resultType="com.yxt.warehouse.biz.warehouseinfo.SmsOrderRock">
+        select
+            sid as warehouseRackSid,
+            rackCode as warehouseRackCode
+        from warehouse_rack
+        where warehouseSid =#{warehouseSid}
+    </select>
     <update id="updateBySidIsDelete">
         UPDATE warehouse_info
         SET isDelete=1

src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java

@@ -172,4 +172,19 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
     public List<WarehouseAreaAllVo> selectAll() {
         return baseMapper.selectAll();
     }
+
+    public ResultBean<List<SmsOrderHouseInfo>> getWareHouse(String createOrgSid) {
+       ResultBean rb = ResultBean.fireFail();
+       List<SmsOrderHouseInfo> list = baseMapper.getWareHouse(createOrgSid);
+        if (!list.isEmpty()) {
+            for (SmsOrderHouseInfo houseInfo : list) {
+                List<SmsOrderRock> houseRock = baseMapper.getHouseRock(houseInfo.getWarehouseSid());
+                if (!houseRock.isEmpty()) {
+                    houseInfo.setHouseRock(houseRock);
+                }
+            }
+            return rb.success().setData(list);
+        }
+       return rb.success();
+    }
 }

src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java

@@ -52,4 +52,5 @@ public interface WarehouseInventoryMapper extends BaseMapper<WarehouseInventory>
 
     IPage<WarehouseInventoryHandleSelectList> handleGoodsListPage(IPage<WarehouseInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw);
 
+    String selInventoryCountBySkuSid(@Param("skuSid") String skuSid);
 }

src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.xml

@@ -288,4 +288,12 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="selInventoryCountBySkuSid" resultType="java.lang.String">
+        SELECT
+            IFNULL( SUM( count ), 0 )
+        FROM
+            warehouse_inventory
+        WHERE
+            goodsSkuSid = #{skuSid}
+    </select>
 </mapper>

src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java

@@ -451,4 +451,8 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
         PagerVo<WarehouseInventoryHandleSelectList> p = PagerUtil.pageToVo(pagging, null);
         return rb.success().setData(p);
     }
+
+    public String selInventoryCountBySkuSid(String skuSid) {
+        return baseMapper.selInventoryCountBySkuSid(skuSid);
+    }
 }