diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index 78ed6dbf..213ae5e3 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -471,7 +471,7 @@ and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) - and dh.status = '1' + and (dh.status = '1' or dh.status = '2' or dh.status = '3') and (dh.sub_type!='采购' and dh.sub_type!='采购退货' and dh.sub_type!='销售' and dh.sub_type!='销售退货') @@ -540,7 +540,7 @@ and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) - and dh.status = '1' + and (dh.status = '1' or dh.status = '2' or dh.status = '3') and (dh.sub_type!='采购' and dh.sub_type!='采购退货' and dh.sub_type!='销售' and dh.sub_type!='销售退货') @@ -942,7 +942,7 @@ and dh.oper_time <= #{endTime} - and dh.status = '1' + and (dh.status = '1' or dh.status = '2' or dh.status = '3') and dh.creator in ( @@ -976,7 +976,7 @@ and dh.oper_time <= #{endTime} - and dh.status = '1' + and (dh.status = '1' or dh.status = '2' or dh.status = '3') and dh.creator in ( diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml index fd430888..e4b31897 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml @@ -443,7 +443,7 @@ - and dh.status = '1' + and (dh.status = '1' or dh.status = '2' or dh.status = '3') and ifnull(m.delete_flag,'0') !='1' group by m.id @@ -500,7 +500,7 @@ - and dh.status = '1' + and (dh.status = '1' or dh.status = '2' or dh.status = '3') and ifnull(di.delete_flag,'0') !='1' group by m.id) cc @@ -537,7 +537,7 @@ - and dh.status = '1' + and (dh.status = '1' or dh.status = '2' or dh.status = '3') and ifnull(dh.delete_flag,'0') !='1' and ifnull(di.delete_flag,'0') !='1' @@ -576,7 +576,7 @@ - and dh.status = '1' + and (dh.status = '1' or dh.status = '2' or dh.status = '3') and ifnull(dh.delete_flag,'0') !='1' and ifnull(di.delete_flag,'0') !='1' @@ -593,7 +593,7 @@ and dh.oper_time >= #{beginTime} and dh.oper_time <= #{endTime} - and dh.status = '1' + and (dh.status = '1' or dh.status = '2' or dh.status = '3') and dh.creator in ( @@ -617,7 +617,7 @@ and dh.oper_time >= #{beginTime} and dh.oper_time <= #{endTime} - and dh.status = '1' + and (dh.status = '1' or dh.status = '2' or dh.status = '3') and dh.creator in (