|
@@ -3,7 +3,6 @@ package com.fjhx.stock.service.impl;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.fjhx.constants.StatusConstant;
|
|
@@ -118,7 +117,6 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
|
|
|
StockBackPlanDetails stockBackPlanDetails =
|
|
|
createStockBackPlanDetails(item.getJobNo(), item.getPlanMaterial(), item.getPlanTime());
|
|
|
stockBackPlanDetails.setQuantity(item.getQuantity());
|
|
|
-
|
|
|
return stockBackPlanDetails;
|
|
|
}
|
|
|
));
|
|
@@ -126,21 +124,17 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
|
|
|
stockBackPlanDetailsService.remove(Wrappers.<StockBackPlanDetails>lambdaQuery()
|
|
|
.between(StockBackPlanDetails::getPlanTime, beginDate, endDate));
|
|
|
|
|
|
- // 领料统计
|
|
|
- QueryWrapper<Object> pickingWrapper = Wrappers.query()
|
|
|
+ // 查询出库
|
|
|
+ List<Map<String, Object>> pickingList = baseMapper.getWater(Wrappers.query()
|
|
|
.ge("swd.CreatedTime", DateUtil.format(beginDate, "yyyy-MM-dd 7:30:00"))
|
|
|
.in("swd.StockChangeType", 20, 23)
|
|
|
.eq("uu.IsDelete", 0)
|
|
|
.in("uu.DepartmentID", "A007", "A008", "A012")
|
|
|
.likeRight("m.Code", "01.")
|
|
|
- .isNotNull("uu.JobNo");
|
|
|
-
|
|
|
- // 查询出库
|
|
|
- List<Map<String, Object>> pickingList = baseMapper.getWater(pickingWrapper);
|
|
|
-
|
|
|
+ .isNotNull("uu.JobNo"));
|
|
|
// 转仓
|
|
|
List<Map<String, Object>> transferPickingList = baseMapper.getTransferPickingList(Wrappers.query()
|
|
|
- .ge("st.check_time", DateUtil.format(beginDate, "yyyy-MM-dd 7:30:00"))
|
|
|
+ .ge("st.submit_time", DateUtil.format(beginDate, "yyyy-MM-dd 7:30:00"))
|
|
|
.eq("st.status", StatusConstant.YES)
|
|
|
);
|
|
|
pickingList.addAll(transferPickingList);
|
|
@@ -155,7 +149,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
|
|
|
int m = Integer.parseInt(DateUtil.format(createTime, "m"));
|
|
|
// 小于7点30算前一日
|
|
|
if (h < 7 || (h == 7 && m <= 30)) {
|
|
|
- DateUtil.offsetDay(createTime, -1);
|
|
|
+ createTime = DateUtil.offsetDay(createTime, -1);
|
|
|
}
|
|
|
|
|
|
// 排班时间
|
|
@@ -202,7 +196,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
|
|
|
|
|
|
// 转仓
|
|
|
List<Map<String, Object>> transferBackList = baseMapper.getTransferBackList(Wrappers.query()
|
|
|
- .ge("st.check_time", DateUtil.format(beginDate, "yyyy-MM-dd 10:00:00"))
|
|
|
+ .ge("st.submit_time", DateUtil.format(beginDate, "yyyy-MM-dd 10:00:00"))
|
|
|
.eq("st.status", StatusConstant.YES)
|
|
|
);
|
|
|
backList.addAll(transferBackList);
|
|
@@ -213,12 +207,11 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
|
|
|
Date createTime = (Date) map.get("createTime");
|
|
|
|
|
|
int h = Integer.parseInt(DateUtil.format(createTime, "H"));
|
|
|
-// int m = Integer.parseInt(DateUtil.format(createTime, "m"));
|
|
|
+ // int m = Integer.parseInt(DateUtil.format(createTime, "m"));
|
|
|
// 小于10点算前一日
|
|
|
if (h < 10) {
|
|
|
- DateUtil.offsetDay(createTime, -1);
|
|
|
+ createTime = DateUtil.offsetDay(createTime, -1);
|
|
|
}
|
|
|
-
|
|
|
// 排班时间
|
|
|
Date planDate = DateUtil.beginOfDay(createTime);
|
|
|
// 工号
|
|
@@ -255,10 +248,9 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
|
|
|
}
|
|
|
|
|
|
// 物料修正
|
|
|
- QueryWrapper<Object> correctWrapper = Wrappers.query()
|
|
|
+ List<Map<String, Object>> correctList = baseMapper.getCorrect(Wrappers.query()
|
|
|
.gt("sbc.correct_time", DateUtil.format(beginDate, "yyyy-MM-dd 00:00:00"))
|
|
|
- .isNotNull("uu.JobNo");
|
|
|
- List<Map<String, Object>> correctList = baseMapper.getCorrect(correctWrapper);
|
|
|
+ .isNotNull("uu.JobNo"));
|
|
|
for (Map<String, Object> map : correctList) {
|
|
|
// 出库时间
|
|
|
Date createTime = (Date) map.get("createTime");
|
|
@@ -277,7 +269,6 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
|
|
|
stockBackPlanDetails = createStockBackPlanDetails(jobNo, materialName, planDate);
|
|
|
stockBackPlanMap.put(jobNo + materialName + planDate, stockBackPlanDetails);
|
|
|
}
|
|
|
-
|
|
|
// 金额
|
|
|
stockBackPlanDetails.setCorrectArea(stockBackPlanDetails.getCorrectArea().add(correctArea));
|
|
|
}
|