销售订单选择仓库
This commit is contained in:
@@ -77,4 +77,10 @@ public class WarehouseInfoRest {
|
|||||||
List<WarehouseAreaAllVo> wmsWarehouseAreaAllVos = wmsWarehouseService.selectAll();
|
List<WarehouseAreaAllVo> wmsWarehouseAreaAllVos = wmsWarehouseService.selectAll();
|
||||||
return rb.success().setData(wmsWarehouseAreaAllVos);
|
return rb.success().setData(wmsWarehouseAreaAllVos);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ApiOperation("订单选择仓库")
|
||||||
|
@PostMapping("/getWareHouse")
|
||||||
|
public ResultBean<List<SmsOrderHouseInfo>> getWareHouse(@RequestParam("createOrgSid") String createOrgSid) {
|
||||||
|
return wmsWarehouseService.getWareHouse(createOrgSid);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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<>();
|
||||||
|
}
|
||||||
@@ -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;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -23,4 +23,8 @@ public interface WarehouseInfoMapper extends BaseMapper<WarehouseInfo> {
|
|||||||
@Select("select * from wms_warehouse_info")
|
@Select("select * from wms_warehouse_info")
|
||||||
List<WarehouseAreaAllVo> selectAll();
|
List<WarehouseAreaAllVo> selectAll();
|
||||||
List<WarehouseInfoVo> listAll(@Param("orgPath")String orgPath);
|
List<WarehouseInfoVo> listAll(@Param("orgPath")String orgPath);
|
||||||
|
|
||||||
|
List<SmsOrderHouseInfo> getWareHouse(@Param("createOrgSid") String createOrgSid);
|
||||||
|
|
||||||
|
List<SmsOrderRock> getHouseRock(@Param("warehouseSid") String warehouseSid);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,6 +22,20 @@
|
|||||||
s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'
|
s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'
|
||||||
</where>
|
</where>
|
||||||
</select>
|
</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 id="updateBySidIsDelete">
|
||||||
UPDATE warehouse_info
|
UPDATE warehouse_info
|
||||||
SET isDelete=1
|
SET isDelete=1
|
||||||
|
|||||||
@@ -172,4 +172,19 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
|
|||||||
public List<WarehouseAreaAllVo> selectAll() {
|
public List<WarehouseAreaAllVo> selectAll() {
|
||||||
return baseMapper.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();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user