|
@@ -167,12 +167,16 @@ public class MaterialGoodsStockLogic {
|
|
|
Integer partsSalesCount = websitNormRecordService.query()
|
|
|
.select("DISTINCT ref_order")
|
|
|
.eq("goods_type", "P")
|
|
|
- .eq("worker_id", wechat.getUser().getWorkerNumber())
|
|
|
+ .and(v -> v.eq("worker_id", wechat.getUser().getUserId())
|
|
|
+ .or()
|
|
|
+ .eq("worker_number", wechat.getUser().getWorkerNumber()))
|
|
|
.between("create_time", curDate + " 00:00:00", curDate + " 23:59:59")
|
|
|
.count();
|
|
|
List<WebsitNormRecord> normRecords2 = websitNormRecordService.lambdaQuery()
|
|
|
.eq(WebsitNormRecord::getGoodsType, "P")
|
|
|
- .eq(WebsitNormRecord::getWorkerId, wechat.getUser().getWorkerNumber())
|
|
|
+ .and(v -> v.eq(WebsitNormRecord::getWorkerId, wechat.getUser().getUserId())
|
|
|
+ .or()
|
|
|
+ .eq(WebsitNormRecord::getWorkerNumber, wechat.getUser().getWorkerNumber()))
|
|
|
.between(WebsitNormRecord::getCreateTime, curDate + " 00:00:00", curDate + " 23:59:59")
|
|
|
.list();
|
|
|
|