aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-09-07 22:16:35 +08:00
parent b2b4371097
commit 67bfee9aa2
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java
View File

@ -59,6 +59,10 @@ public class EmisWarehouseIn extends BaseEntity
private Date confirmDate;
/* 占用状态 0-未占用 1-已全部占用 2-不分占用 */
private String usedStatus;
/* 进仓标记 0-未进仓 1-已进仓 */
private String stockInFlag;
/* 状态 0-初始 */
private String status;
@ -73,8 +77,7 @@ public class EmisWarehouseIn extends BaseEntity
private BigDecimal totalWeight;
/* 进仓标记 0-未进仓 1-已进仓 */
private String stockInFlag;
// 入仓批次信息
private List<EmisWarehouseInBatch> stockInBatchList;

11
emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
View File

@ -115,6 +115,8 @@
where
b.del_flag='0' and order_status !='0'
and a.main_bill_code=b.bill_code
and ( b.problem_type is null or (b.problem_type is not null and (b.problem_type != 173 and b.problem_type != 170 and b.problem_type != 151) ) )
<if test="params.billCode != null and params.billCode != ''">
and ( FIND_IN_SET(b.`bill_code`,#{params.billCode}) or b.bill_code like concat('%', #{params.billCode}, '%') )
@ -170,6 +172,9 @@
<!--获取签收异常扫描统计数据-->
<!--and b.bill_code not in (
select bill_code from emis_waybill_problem_info ewpi where ewpi.del_flag='0' and ewpi.`problem_type` in(151,173,170)
)-->
<select id="queryScanStatList" parameterType="EmisTmsScanRecord" resultMap="ScanStatDataInfoResult">
select t1.scan_site_code,t1.scan_count,ifnull(t2.sign_count,0) as sign_count,round(round(ifnull(t2.sign_count,0)/t1.scan_count,3)*100,1) as sign_rate
@ -177,9 +182,9 @@
select a.scan_site_code ,count(DISTINCT a.main_bill_code) as scan_count
from emis_tms_scan_record a,emis_waybill b
where a.del_flag='0' and b.del_flag='0' and a.main_bill_code=b.bill_code
and b.bill_code not in (
select bill_code from emis_waybill_problem_info ewpi where ewpi.del_flag='0' and ewpi.`problem_type` in(151,173,170)
)
and ( b.problem_type is null or (b.problem_type is not null and (b.problem_type != 173 and b.problem_type != 170 and b.problem_type != 151) ) )
and a.scan_type=#{scanType}
<if test="scanType != null and scanType == '20'">