java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge branch 'dev' into pre-production

master
汤建军 7 months ago
parent
390adfb40a 13572bca56
commit
e7aa560e02
2 changed files with 43 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 68
      blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml
  2. 46
      blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java

68
blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml
Unescape View File

@ -493,7 +493,7 @@
</select>
<select id="findSignforDataByMonth" resultType="java.lang.Integer">
SELECT
((
(
SELECT
IFNULL( SUM( received_quantity ), 0 )
FROM
@ -509,27 +509,11 @@
</foreach>
</if>
</where>
) + (
SELECT
IFNULL( SUM( quantity ), 0 )
FROM
logpm_distribution_bill_lading_scan
<where>
material_type = 2
AND DATE_FORMAT( create_time, "%y%m" ) = DATE_FORMAT( #{param.dayStr}, "%y%m" )
AND is_deleted = 0
<if test="param.warehouseIds != null">
and warehouse_id in
<foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</where>
)) AS num
) AS num
</select>
<select id="findUnSignforDataByDay" resultType="java.lang.Integer">
SELECT
((
(
SELECT
IFNULL( sum( quantity ), 0 )
FROM
@ -547,29 +531,11 @@
</foreach>
</if>
</where>
) + (
SELECT
IFNULL( sum( quantity ), 0 )
FROM
logpm_distrilbution_bill_package AS ldbp
LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldbp.parce_list_id = ldpl.id
<where>
ldpl.order_package_status != 70
AND ldbp.packet_bar_status != 2
AND ldbp.is_deleted = 0
AND DATE_FORMAT( ldbp.create_time, "%y%m%d" ) = DATE_FORMAT( #{param.dayStr}, "%y%m%d" )
<if test="param.warehouseIds != null">
AND ldpl.warehouse_id IN
<foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</where>
))
)
</select>
<select id="findUnSignforDataByMonth" resultType="java.lang.Integer">
SELECT
((
(
SELECT
IFNULL( sum( quantity ), 0 )
FROM
@ -587,25 +553,7 @@
</foreach>
</if>
</where>
) + (
SELECT
IFNULL( sum( quantity ), 0 )
FROM
logpm_distrilbution_bill_package AS ldbp
LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldbp.parce_list_id = ldpl.id
<where>
ldpl.order_package_status != 70
AND ldbp.packet_bar_status != 2
AND ldbp.is_deleted = 0
AND DATE_FORMAT( ldbp.create_time, "%y%m" ) = DATE_FORMAT( #{param.dayStr}, "%y%m" )
<if test="param.warehouseIds != null">
AND ldpl.warehouse_id IN
<foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</where>
))
)
</select>
<select id="findClerkSignforNumByDay" resultType="java.lang.Integer">
SELECT
@ -655,7 +603,7 @@
<where>
reservation_status != 40
AND is_deleted = 0
AND DATE_FORMAT(created_time, "%y%m%d" ) = DATE_FORMAT( #{param.dayStr}, "%y%m%d" )
AND DATE_FORMAT(create_time, "%y%m%d" ) = DATE_FORMAT( #{param.dayStr}, "%y%m%d" )
<if test="param.warehouseIds != null">
AND warehouse_id IN
<foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
@ -672,7 +620,7 @@
<where>
reservation_status != 40
AND is_deleted = 0
AND DATE_FORMAT(created_time, "%y%m" ) = DATE_FORMAT( #{param.dayStr}, "%y%m" )
AND DATE_FORMAT(create_time, "%y%m" ) = DATE_FORMAT( #{param.dayStr}, "%y%m" )
<if test="param.warehouseIds != null">
AND warehouse_id IN
<foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">

46
blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java
Unescape View File

@ -310,19 +310,28 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService {
Integer dayUnSignforNum = warehouseIndexMapper.findUnSignforDataByDay(indexDTO);
indexSignforDayDataVO.setUnSignNum(dayUnSignforNum);
//计算签收率
Double daySignforScale = (double) (daySignforNum / (daySignforNum + dayUnSignforNum) * 100);
indexSignforDayDataVO.setSignScale(daySignforScale);
if (daySignforNum > 0 && (daySignforNum + dayUnSignforNum) >0){
Double daySignforScale = (double) (daySignforNum / (daySignforNum + dayUnSignforNum) * 100);
indexSignforDayDataVO.setSignScale(daySignforScale);
}else {
indexSignforDayDataVO.setSignScale(0.00);
}
//查询当天文员复核数
Integer dayClerkSignforNum = warehouseIndexMapper.findClerkSignforNumByDay(indexDTO);
indexSignforDayDataVO.setClerkSignNum(dayClerkSignforNum);
//查询当天计划数
Integer dayPlanByday = warehouseIndexMapper.findPlanNumByDay(indexDTO);
//计算文员签收率
Double dayClerkSignforScale = (double) (dayClerkSignforNum / (dayPlanByday + dayClerkSignforNum));
indexSignforDayDataVO.setClerkSignforScale(dayClerkSignforScale);
if (dayClerkSignforNum > 0 && (dayPlanByday + dayClerkSignforNum)>0){
Double dayClerkSignforScale = (double) (dayClerkSignforNum / (dayPlanByday + dayClerkSignforNum));
indexSignforDayDataVO.setClerkSignforScale(dayClerkSignforScale);
} else {
indexSignforDayDataVO.setClerkSignforScale(0.00);
}
//文员超时复核数
Integer dayClerkOverTimeSignfoNum = warehouseIndexMapper.findClerkOverTimeNumByDay(indexDTO);
// indexSignforDayDataVO.setClerkOverTimeSignfoNum(dayClerkOverTimeSignfoNum);
indexSignforDayDataVO.setClerkOverTimeSignfoNum(dayClerkOverTimeSignfoNum);
indexSignforDayDataVO.setClerkSignNum(dayClerkSignforNum);
@ -336,19 +345,34 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService {
Integer monthUnSignforNum = warehouseIndexMapper.findUnSignforDataByMonth(indexDTO);
indexSignforMonthDataVO.setUnSignNum(monthUnSignforNum);
//计算签收率
Double monthSignforScale = (double) (monthSignforNum / (monthUnSignforNum + monthSignforNum) * 100);
indexSignforMonthDataVO.setSignScale(monthSignforScale);
if (monthSignforNum > 0 && (monthUnSignforNum + monthSignforNum) > 0){
Double monthSignforScale = (double) (monthSignforNum / (monthUnSignforNum + monthSignforNum));
indexSignforMonthDataVO.setSignScale(monthSignforScale);
}else {
indexSignforMonthDataVO.setSignScale(0.00);
}
//查询当月文员复核数
Integer monthClerkSignforNum = warehouseIndexMapper.findClerkSignforNumByMonth(indexDTO);
indexSignforMonthDataVO.setClerkSignNum(monthClerkSignforNum);
Integer monthPlanByday = warehouseIndexMapper.findPlanNumByMonth(indexDTO);
Double monthClerkSignforScale = (double) (monthClerkSignforNum / (monthPlanByday + monthClerkSignforNum));
indexSignforMonthDataVO.setClerkSignforScale(monthClerkSignforScale);
if (monthClerkSignforNum > 0 && (monthPlanByday + monthClerkSignforNum)>0){
Double monthClerkSignforScale = (double) (monthClerkSignforNum / (monthPlanByday + monthClerkSignforNum));
indexSignforMonthDataVO.setClerkSignforScale(monthClerkSignforScale);
}else {
indexSignforMonthDataVO.setClerkSignforScale(0.00);
}
//查询当月文员复核
Integer monthClerkOverTimeSignfoNum = warehouseIndexMapper.findClerkOverTimeNumByMonth(indexDTO);
indexSignforMonthDataVO.setClerkOverTimeSignfoNum(monthClerkOverTimeSignfoNum);
Double monthClerkOverTimeScale = (double) (monthClerkOverTimeSignfoNum / monthPlanByday);
indexSignforMonthDataVO.setClerkOverTimeScale(monthClerkOverTimeScale);
if (monthClerkOverTimeSignfoNum >0 && monthPlanByday>0){
Double monthClerkOverTimeScale = (double) (monthClerkOverTimeSignfoNum / monthPlanByday);
indexSignforMonthDataVO.setClerkOverTimeScale(monthClerkOverTimeScale);
}else {
indexSignforMonthDataVO.setClerkOverTimeScale(0.00);
}
list.add(indexSignforMonthDataVO);
return list;
}

Write Preview
Loading…
Cancel
Save