open_platform/ss-common-storage
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

库存

Browse Source
This commit is contained in:
wangpengfei
2024-09-04 17:59:26 +08:00
parent 2d01a8b31a
commit 453ccf6061
24 changed files with 163 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaRest.java
View File

@@ -75,4 +75,11 @@ public class WarehouseAreaRest {
List<WarehouseAreaAllVo> vo = wmsWarehouseAreaService.selectAll(ckSid);
return rb.success().setData(vo);
}
@ApiOperation("根据仓库sid查询所有库位")
@GetMapping("/selectAreaByRackSid")
public ResultBean<List<WarehouseAreaAllVo>> selectAreaByRackSid(@RequestParam("ckSid") String ckSid){
ResultBean rb = ResultBean.fireFail();
WarehouseAreaAllVo vo = wmsWarehouseAreaService.selectAreaByRackSid(ckSid);
return rb.success().setData(vo);
}
}

8
src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java
View File

@@ -347,7 +347,12 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
warehouseInventory.setGoodsSkuOwnSpec(dto2.getSpecValue());
warehouseInventory.setGoodsSpuName(dto2.getGoodsSpuName());
warehouseInventory.setGoodSpuSid(dto2.getGoodsSpuSid());
warehouseInventory.setGoodsTypeSid(dto2.getGoodsTypeSid());
warehouseInventory.setGoodsTypeName(dto2.getGoodsTypeName());
warehouseInventory.setGoodsBrandName(dto2.getGoodsBrandName());
warehouseInventory.setGoodsBrandSid(dto2.getGoodsBrandSid());
warehouseInventory.setManufacturerName(dto2.getManufacturerName());
warehouseInventory.setManufacturerSid(dto2.getManufacturerSid());
String billNo1 = dto2.getGoodsSkuCode() + date;
String b = baseMapper.selectNum(billNo1);
if (org.apache.commons.lang3.StringUtils.isNotBlank(b)) {
@@ -379,7 +384,6 @@ public class PurchaseInventoryBillService extends MybatisBaseService<PurchaseInv
List<PurchaseInventoryBillDetailDto2> s=groupingMap.get(a);
String sourceBillSid=groupingMap.get(a).get(0).getSourceBillSid();
WarehouseAnsBill warehouseAnsBill=warehouseAnsBillService.getOne(new QueryWrapper<WarehouseAnsBill>().eq("sid",sourceBillSid));
warehouseAnsBillDetailService.list(new QueryWrapper<WarehouseAnsBillDetail>().eq("sourceBillSid",sourceBillSid));
BeanUtil.copyProperties(warehouseAnsBill,dto2);
dto2.setSourceBillSid(warehouseAnsBill.getSid());
dto2.setSourceBillNo(warehouseAnsBill.getBillNo());

6
src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetail.java
View File

@@ -57,4 +57,10 @@ public class PurchaseInventoryBillDetail extends BaseEntity {
@ApiModelProperty("创建组织sid")
private String createOrgSid;
private String remarks;
private String goodsBrandSid;
private String goodsBrandName;
private String goodsTypeSid;
private String goodsTypeName;
private String manufacturerSid;
private String manufacturerName;
}

6
src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto.java
View File

@@ -55,4 +55,10 @@ public class PurchaseInventoryBillDetailDto {
@ApiModelProperty("创建组织sid")
private String createOrgSid;
private String remarks;
private String goodsBrandSid;
private String goodsBrandName;
private String goodsTypeSid;
private String goodsTypeName;
private String manufacturerSid;
private String manufacturerName;
}

7
src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java
View File

@@ -67,5 +67,10 @@ public class PurchaseInventoryBillDetailDto2 {
private String remarks;
private String warehouseName;
private String warehouseSid;
private String goodsBrandSid;
private String goodsBrandName;
private String goodsTypeSid;
private String goodsTypeName;
private String manufacturerSid;
private String manufacturerName;
}

12
src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailService.java
View File

@@ -115,6 +115,12 @@ public class PurchaseInventoryBillDetailService extends MybatisBaseService<Purch
warehouseInventory.setBusTypeValue("采购入库");
warehouseInventory.setSourceBillNo(p.getSid());
warehouseInventory.setSourceBillSid(p.getBillNo());
warehouseInventory.setGoodsTypeSid(warehouseAnsBillDetail.getGoodsTypeSid());
warehouseInventory.setGoodsTypeName(warehouseAnsBillDetail.getGoodsTypeName());
warehouseInventory.setGoodsBrandName(warehouseAnsBillDetail.getGoodsBrandName());
warehouseInventory.setGoodsBrandSid(warehouseAnsBillDetail.getGoodsBrandSid());
warehouseInventory.setManufacturerName(warehouseAnsBillDetail.getManufacturerName());
warehouseInventory.setManufacturerSid(warehouseAnsBillDetail.getManufacturerSid());
warehouseInventoryService.saveInventory(warehouseInventory);
baseMapper.insert(purchaseInventoryBillDetail);
}
@@ -183,6 +189,12 @@ public class PurchaseInventoryBillDetailService extends MybatisBaseService<Purch
warehouseInventory.setBusTypeValue("采购入库");
warehouseInventory.setSourceBillNo(p.getSid());
warehouseInventory.setSourceBillSid(p.getBillNo());
warehouseInventory.setGoodsTypeSid(warehouseAnsBillDetail.getGoodsTypeSid());
warehouseInventory.setGoodsTypeName(warehouseAnsBillDetail.getGoodsTypeName());
warehouseInventory.setGoodsBrandName(warehouseAnsBillDetail.getGoodsBrandName());
warehouseInventory.setGoodsBrandSid(warehouseAnsBillDetail.getGoodsBrandSid());
warehouseInventory.setManufacturerName(warehouseAnsBillDetail.getManufacturerName());
warehouseInventory.setManufacturerSid(warehouseAnsBillDetail.getManufacturerSid());
warehouseInventoryService.saveInventory(warehouseInventory);
baseMapper.insert(purchaseInventoryBillDetail);
}

6
src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetail.java
View File

@@ -40,4 +40,10 @@ public class WarehouseAnsBillDetail extends BaseEntity {
private BigDecimal price;//单价
private BigDecimal totalPrice;//总价
private String batch;//批次
private String goodsBrandSid;
private String goodsBrandName;
private String goodsTypeSid;
private String goodsTypeName;
private String manufacturerSid;
private String manufacturerName;
}

6
src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailDto.java
View File

@@ -37,4 +37,10 @@ public class WarehouseAnsBillDetailDto {
private double price;//单价
private double totalPrice;//总价
private String batch;//批次
private String goodsBrandSid;
private String goodsBrandName;
private String goodsTypeSid;
private String goodsTypeName;
private String manufacturerSid;
private String manufacturerName;
}

3
src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.java
View File

@@ -22,4 +22,7 @@ public interface WarehouseAreaMapper extends BaseMapper<WarehouseArea> {
@Select("select * from warehouse_area where warehouseSid = #{ckSid} and isDelete!='1' and isEnable='1'")
List<WarehouseAreaAllVo> selectAll(String ckSid);
List<WarehouseAreaVo> listAll(@Param("orgPath")String orgPath);
WarehouseAreaAllVo selectAreaByRackSid(String rackSid);
}

6
src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.xml
View File

@@ -33,6 +33,12 @@
where a.sid =#{sid}
</select>
<select id="selectAreaByRackSid" resultType="com.yxt.warehouse.biz.warehousearea.WarehouseAreaAllVo">
select * from warehouse_area a
left join warehouse_rack b on a.sid =b.locationSid
where b.locationSid=#{areaSid}
</select>
<update id="updateBySidIsDelete">
UPDATE warehouse_area
SET isDelete=1

4
src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java
View File

@@ -144,4 +144,8 @@ public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper
public List<WarehouseAreaAllVo> selectAll(String ckSid) {
return baseMapper.selectAll(ckSid);
}
public WarehouseAreaAllVo selectAreaByRackSid(String rackSid) {
return baseMapper.selectAreaByRackSid(rackSid);
}
}

8
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapQuery.java
View File

@@ -10,12 +10,6 @@ import lombok.Data;
@Data
public class WarehouseInfoMapQuery {
private String name;//仓库名称
@ApiModelProperty("菜单路由")
private String menuUrl;
@ApiModelProperty("组织全路径sid")
@ApiModelProperty("组织sid")
private String orgPath;
@ApiModelProperty("用户sid")
private String userSid;
private String orgLevelKey;//
private int index;//下标
}

1
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoMapper.java
View File

@@ -18,6 +18,7 @@ import java.util.List;
@Mapper
public interface WarehouseInfoMapper extends BaseMapper<WarehouseInfo> {
IPage<WarehouseInfoVo> listPage(IPage<WarehouseInfo> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInfo> qw);
List<WarehouseInfo> listQuery( @Param(Constants.WRAPPER) QueryWrapper<WarehouseInfo> qw);
int updateBySidIsDelete(List<String> list);
@Select("select * from wms_warehouse_info")

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

@@ -13,6 +13,15 @@
${ew.sqlSegment}
</where>
</select>
<select id="listQuery" resultType="com.yxt.warehouse.biz.warehouseinfo.WarehouseInfo">
select
a.*
from warehouse_info a
LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="listAll" resultType="com.yxt.warehouse.biz.warehouseinfo.WarehouseInfoVo">
select
*

29
src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java
View File

@@ -86,34 +86,11 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
public ResultBean<List<WarehouseInfo>> listQuery(WarehouseInfoMapQuery query) {
ResultBean rb = ResultBean.fireFail();
QueryWrapper<WarehouseInfo> qw = new QueryWrapper<>();
// if (StringUtils.isNotBlank(query.getOrgLevelKey())) {
// //数据权限ID(1全部、2本部门及子部门、3本部门、4个人)
// String orgLevelKey=query.getOrgLevelKey();
// String orgSidPath=query.getOrgPath();
// int index=query.getIndex();
// if ("1".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, index);
// qw.like("s.orgSidPath", orgSidPath);
// } else if ("2".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, index);
// qw.like("s.orgSidPath", orgSidPath);
// } else if ("3".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, index);
// qw.apply("s.orgSidPath like('"+orgSidPath+"')");
// } else if ("4".equals(orgLevelKey)) {
// qw.eq("a.createBySid", query.getUserSid());
// } else {
// PagerVo<WarehouseInfo> p = new PagerVo<>();
// return rb.success().setData(p);
// }
// } else {
// PagerVo<WarehouseInfo> p = new PagerVo<>();
// return rb.success().setData(p);
// }
qw.like("s.orgSidPath", query.getOrgPath());
if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getName())) {
qw.like("name", query.getName());
qw.like("a.warehouseName", query.getName());
}
List<WarehouseInfo> storeInfos = baseMapper.selectList(qw);
List<WarehouseInfo> storeInfos = baseMapper.listQuery(qw);
for (WarehouseInfo storeInfo : storeInfos) {
if(StringUtils.isNotBlank(storeInfo.getLngAndLat())){
String []w=storeInfo.getLngAndLat().split(",");

4
src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventory.java
View File

@@ -65,5 +65,9 @@ public class WarehouseInventory extends BaseEntity {
private String createOrgSid;
@ApiModelProperty("使用组织sid")
private String useOrgSid;
private String goodsBrandSid;
private String goodsBrandName;
private String goodsTypeSid;
private String goodsTypeName;
}

4
src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryDto.java
View File

@@ -77,5 +77,9 @@ public class WarehouseInventoryDto implements Dto {
private String busTypeValue;
private String sourceBillSid;
private String sourceBillNo;
private String goodsBrandSid;
private String goodsBrandName;
private String goodsTypeSid;
private String goodsTypeName;
}

2
src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryMapper.java
View File

@@ -18,7 +18,9 @@ import java.util.List;
public interface WarehouseInventoryMapper extends BaseMapper<WarehouseInventory> {
IPage<WarehouseInventoryVo> listPage(IPage<WarehouseInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw);
IPage<WarehouseInventoryVo> listPage1(IPage<WarehouseInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw);
List<WarehouseInventoryVo> getListBySpuSid(@Param("spuSid")String spuSid);
List<WarehouseInventoryVo> getListBySpuSid1(@Param("spuSid")String spuSid);
List<WarehouseInventoryRackVo> getRackCountBySid(@Param("sid")String sid,@Param("orgSid") String orgSid);
List<WarehouseInventoryRackVo> getRackCountBySid1(@Param("sid")String sid,@Param("orgSid") String orgSid);

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

@@ -6,21 +6,34 @@
<select id="listPage" resultType="com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryVo">
select
a.goodsID,
a.sid,
a.goodsSpuName,
a.goodsSpuSid,
a.goodsSkuSid,
a.goodsSkuCode,
a.goodsSkuOwnSpec,
a.unit,
a.warehouseName,
a.warehouseRackCode,
sum(a.count) as count ,
sum(a.allocateCount) as allocateCount,
sum(a.count-a.allocateCount) as useCount,
sum(a.freezeCount) as freezeCount,
a.batchNumber
a.batchNumber,
a.goodsTypeName as typeName
from warehouse_inventory a
LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="listPage1" resultType="com.yxt.warehouse.biz.warehouseinventory.WarehouseInventoryVo">
select
a.goodsSpuName,
a.goodsSpuSid,
a.unit,
sum(a.count) as count ,
sum(a.allocateCount) as allocateCount,
sum(a.count-a.allocateCount) as useCount,
sum(a.freezeCount) as freezeCount,
a.warehouseName,
a.warehouseRackCode,
a.warehouseRackSid,
a.goodsTypeName as typeName
from warehouse_inventory a
LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
<where>
@@ -31,20 +44,21 @@
select
a.goodsID,
a.sid,
a.goodsSpuName,
a.goodsSkuTitle,
a.goodsSpuSid,
a.goodsSkuSid,
a.goodsSkuCode,
a.goodsSkuOwnSpec,
a.goodsSkuTitle,
a.unit,
a.warehouseName,
a.warehouseRackCode,
a.count as count ,
a.allocateCount as allocateCount,
a.count-a.allocateCount as useCount,
a.freezeCount as freezeCount,
a.batchNumber
sum(a.count) as count ,
sum(a.allocateCount) as allocateCount,
sum(a.count-a.allocateCount) as useCount,
sum(a.freezeCount) as freezeCount,
a.batchNumber,
a.goodsTypeName as typeName,
a.goodsBrandName as brandName
from warehouse_inventory a
<where>
a.goodsSpuSid=#{spuSid}

2
src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryQuery.java
View File

@@ -26,7 +26,7 @@ public class WarehouseInventoryQuery implements Query {
@ApiModelProperty("条码")
private String barCode;
private String hh;
private String itemNumber;
private String orgLevelKey;//权限等级
@ApiModelProperty("菜单路由")
private String menuUrl;

26
src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryService.java
View File

@@ -14,6 +14,8 @@ import com.yxt.warehouse.biz.purchaseinventorybill.PurchaseInventoryBillPageVo;
import com.yxt.warehouse.biz.warehouseansbill.WarehouseAnsBillService;
import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailService;
import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsListDetailsVo;
import com.yxt.warehouse.biz.warehousearea.WarehouseAreaAllVo;
import com.yxt.warehouse.biz.warehousearea.WarehouseAreaService;
import com.yxt.warehouse.biz.warehouseinventorybatch.WarehouseInventoryBatch;
import com.yxt.warehouse.biz.warehouseinventorybatch.WarehouseInventoryBatchService;
import com.yxt.warehouse.biz.warehouseinventoryhistory.WarehouseInventoryHistory;
@@ -38,6 +40,8 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
WarehouseInventoryRecordService warehouseInventoryRecordService;
@Autowired
WarehouseInventoryBatchService warehouseInventoryBatchService;
@Autowired
WarehouseAreaService warehouseAreaService;
public ResultBean<PagerVo<WarehouseInventoryVo>> listPage(PagerQuery<WarehouseInventoryQuery> pq) {
ResultBean rb =new ResultBean().fail();
WarehouseInventoryQuery query = pq.getParams();
@@ -67,19 +71,19 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
return rb.success().setData(p);
}
if (StringUtils.isNotBlank(query.getWarehouseSid())) {
qw.like("a.warehouseNameSid", query.getWarehouseSid());
qw.eq("a.warehouseSid", query.getWarehouseSid());
}
if (StringUtils.isNotBlank(query.getGoodsSpuSid())) {
qw.like("a.goodsSpuSid", query.getGoodsSpuSid());
qw.eq("a.goodsSkuSid", query.getGoodsSpuSid());
}
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.like("a.brandSid", query.getBrandSid());
qw.eq("a.goodsBrandSid", query.getBrandSid());
}
if (StringUtils.isNotBlank(query.getSpec())) {
qw.like("a.goodsSkuOwnSpec", query.getSpec());
}
if (StringUtils.isNotBlank(query.getGoodsSpuSid())) {
qw.like("a.goodsSpuSid", query.getGoodsSpuSid());
qw.eq("a.goodsSpuSid", query.getGoodsSpuSid());
}
qw.apply(StringUtils.isNotBlank(query.getCountStart()), "a.count >= " + query.getCountStart()).
apply(StringUtils.isNotBlank(query.getCountEnd()), "a.count <= " + query.getCountEnd()
@@ -109,7 +113,7 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
.add(vo.getOtherOnTheWay())
.add(vo.getWorkOrderInTransit()));
}
record.setWarehouseInventorys(vos);
record.setChildren(vos);
}
PagerVo<WarehouseInventoryVo> p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(p);
@@ -143,13 +147,13 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
return rb.success().setData(p);
}
if (StringUtils.isNotBlank(query.getWarehouseSid())) {
qw.like("a.warehouseNameSid", query.getWarehouseSid());
qw.eq("a.warehouseNameSid", query.getWarehouseSid());
}
if (StringUtils.isNotBlank(query.getGoodsSpuSid())) {
qw.like("a.goodsSpuSid", query.getGoodsSpuSid());
qw.eq("a.goodsSpuSid", query.getGoodsSpuSid());
}
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.like("a.brandSid", query.getBrandSid());
qw.eq("a.goodsBrandSid", query.getBrandSid());
}
if (StringUtils.isNotBlank(query.getSpec())) {
qw.like("a.goodsSkuOwnSpec", query.getSpec());
@@ -163,13 +167,15 @@ public class WarehouseInventoryService extends MybatisBaseService<WarehouseInven
qw.eq("1",1);
qw.groupBy("a.goodsSpuSid");
IPage<WarehouseInventory> page = PagerUtil.queryToPage(pq);
IPage<WarehouseInventoryVo> pagging = baseMapper.listPage(page, qw);
IPage<WarehouseInventoryVo> pagging = baseMapper.listPage1(page, qw);
for (WarehouseInventoryVo record : pagging.getRecords()) {
WarehouseAreaAllVo vo1=warehouseAreaService.selectAreaByRackSid(record.getWarehouseRackSid());
List<WarehouseInventoryVo> vos=baseMapper.getListBySpuSid(record.getGoodsSpuSid());
for (WarehouseInventoryVo vo : vos) {
vo.setMainSid(record.getGoodsSpuSid());
}
record.setWarehouseInventorys(vos);
record.setWarehouseAreaName(vo1.getAreaName());
record.setChildren(vos);
}
PagerVo<WarehouseInventoryVo> p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(p);

9
src/main/java/com/yxt/warehouse/biz/warehouseinventory/WarehouseInventoryVo.java
View File

@@ -21,15 +21,20 @@ public class WarehouseInventoryVo implements Vo {
private String goodsSpuSid;
@ApiModelProperty("商品名称")
private String goodsSpuName;
private String goodsSpuCode;
private String barCode;
private String goodsSkuSid;
@ApiModelProperty("商品编码")
private String goodsSkuCode;
private String goodsSkuTitle;
@ApiModelProperty("规格型号")
private String goodsSkuOwnSpec;
@ApiModelProperty("计量单位")
private String unit;
@ApiModelProperty("仓库名称")
private String warehouseName;
private String warehouseAreaName;
private String warehouseRackSid;
@ApiModelProperty("库位名称")
private String warehouseRackCode;
@ApiModelProperty("现有库存")
@@ -62,6 +67,8 @@ public class WarehouseInventoryVo implements Vo {
private String batchNumber;
@ApiModelProperty("序列号")
private String serialNumber;
private List<WarehouseInventoryVo> warehouseInventorys=new ArrayList<>();
private String brandName;
private String typeName;
private List<WarehouseInventoryVo> children=new ArrayList<>();
}

5
src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordQuery1.java
View File

@@ -10,7 +10,9 @@ import lombok.Data;
*/
@Data
public class WarehouseInventoryRecordQuery1 implements Query {
private String billSid;
private String sid;
private String type;
private String goodsSpuName;
private String goodsSkuTitle;
private String spec;
@@ -18,7 +20,6 @@ public class WarehouseInventoryRecordQuery1 implements Query {
private String billType;
private String startTime;
private String endTime;
private String orgLevelKey;//权限等级
@ApiModelProperty("菜单路由")
private String menuUrl;

36
src/main/java/com/yxt/warehouse/biz/warehouseinventoryrecord/WarehouseInventoryRecordService.java
View File

@@ -237,7 +237,7 @@ public class WarehouseInventoryRecordService extends MybatisBaseService<Warehous
orgSidPath = orgSidPath.substring(0, index);
qw.apply("s.orgSidPath like('"+orgSidPath+"')");
} else if ("4".equals(orgLevelKey)) {
qw.eq("wab.createBySid", query.getUserSid());
qw.eq("a.createBySid", query.getUserSid());
} else {
PagerVo<WarehouseInventoryRecordListVo> p = new PagerVo<>();
return rb.success().setData(p);
@@ -246,26 +246,28 @@ public class WarehouseInventoryRecordService extends MybatisBaseService<Warehous
PagerVo<WarehouseInventoryRecordListVo> p = new PagerVo<>();
return rb.success().setData(p);
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getGoodsSkuTitle())) {
qw.like("r.busTypeValue", query.getGoodsSkuTitle());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getGoodsSpuName())) {
qw.like("r.goodsSpuName", query.getGoodsSpuName());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getWarehouseName())) {
qw.like("r.warehouseName", query.getWarehouseName());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getSpec())) {
qw.like("r.goodsSkuCode", query.getSpec());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getBillType())) {
qw.like("r.goodsSkuCode", query.getBillType());
qw.like("a.busTypeValue", query.getBillType());
}
qw.apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getStartTime()), "date_format (wab.createTime,'%Y-%m-%d') >= date_format('" + query.getStartTime() + "','%Y-%m-%d')").
apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getEndTime()), "date_format (wab.createTime,'%Y-%m-%d') <= date_format('" + query.getEndTime() + "','%Y-%m-%d')"
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getGoodsSpuName())) {
qw.like("a.goodsSpuName", query.getGoodsSpuName());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getWarehouseName())) {
qw.like("a.warehouseName", query.getWarehouseName());
}
if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getSpec())) {
qw.like("a.goodsSkuOwnSpec", query.getSpec());
}
qw.apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getStartTime()), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + query.getStartTime() + "','%Y-%m-%d')").
apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getEndTime()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getEndTime() + "','%Y-%m-%d')"
);
qw.eq("sourceBillSid",query.getBillSid());
// qw.eq("sourceBillSid",query.getBillSid());
IPage<WarehouseInventoryRecord> page = PagerUtil.queryToPage(pq);
if(query.getType().equals("1")){
qw.eq("a.goodSpuSid",query.getSid());
}else if(query.getType().equals("2")){
qw.eq("a.goodSkuSid",query.getSid());
}
IPage<WarehouseInventoryRecordListVo> pagging = baseMapper.getWarehouseInventoryRecord(page, qw);
PagerVo<WarehouseInventoryRecordListVo> p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(p);