r
/
hangtag
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
wwb 2025-12-09 14:54:40 +08:00
parent 651fe9b938
commit b94515daef
5 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderPageReqVO.java
View File

@ -48,6 +48,9 @@ public class SaleOrderPageReqVO extends PageParam {
@Schema(description = "单据状态")
private String billStatus;
@Schema(description = "物流单号")
private String logisticsCode;
@Schema(description = "订单状态")
private String orderStatus;

1
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
View File

@ -260,6 +260,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
if(
StringUtils.isNotBlank(pageReqVO.getBillno())
||StringUtils.isNotBlank(pageReqVO.getBillStatus())
||StringUtils.isNotBlank(pageReqVO.getLogisticsCode())
||StringUtils.isNotBlank(pageReqVO.getPhone())
||StringUtils.isNotBlank(pageReqVO.getRemarks())
||ObjectUtil.isNotEmpty(pageReqVO.getBizdate())

5
hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/mapper/saleorder/SaleOrderMapper.xml
View File

@ -11,6 +11,7 @@
left join oms_brand brand on brand.id = a.brand_id
<where>
<if test="reqVO.billno != null and reqVO.billno != '' "> AND a.billno = #{reqVO.billno} </if>
<if test="reqVO.logisticsCode != null and reqVO.logisticsCode != '' "> AND a.logistics_code = #{reqVO.logisticsCode} </if>
<if test="reqVO.customerId != null "> AND a.customer_id = #{reqVO.customerId} </if>
<if test="reqVO.bizdate != null "> AND a.bizdate between #{reqVO.bizdate[0]} AND #{reqVO.bizdate[1]}</if>
<if test="reqVO.confirmdate != null "> AND a.confirmdate between #{reqVO.confirmdate[0]} AND #{reqVO.confirmdate[1}</if>
@ -33,6 +34,7 @@
left join oms_brand brand on brand.id = a.brand_id
<where>
<if test="reqVO.billno != null and reqVO.billno != '' "> AND a.billno = #{reqVO.billno} </if>
<if test="reqVO.logisticsCode != null and reqVO.logisticsCode != '' "> AND a.logistics_code = #{reqVO.logisticsCode} </if>
<if test="reqVO.customerId != null "> AND a.customer_id = #{reqVO.customerId} </if>
<if test="reqVO.bizdate != null "> AND a.bizdate between #{reqVO.bizdate[0]} AND #{reqVO.bizdate[1]}</if>
<if test="reqVO.confirmdate != null "> AND a.confirmdate between #{reqVO.confirmdate[0]} AND #{reqVO.confirmdate[1}</if>
@ -93,12 +95,13 @@
<select id="querySumTotalQty" resultType="Long" >
select sum(b.qty) from oms_saleorder a
select COALESCE(sum(b.qty),0) from oms_saleorder a
left join oms_saleorder_entry b on a.id = b.parent_id
left join oms_customer cus on cus.id = a.customer_id
left join oms_brand brand on brand.id = a.brand_id
<where>
<if test="reqVO.billno != null and reqVO.billno != '' "> AND a.billno = #{reqVO.billno} </if>
<if test="reqVO.logisticsCode != null and reqVO.logisticsCode != '' "> AND a.logistics_code = #{reqVO.logisticsCode} </if>
<if test="reqVO.customerId != null "> AND a.customer_id = #{reqVO.customerId} </if>
<if test="reqVO.bizdate != null "> AND a.bizdate between #{reqVO.bizdate[0]} AND #{reqVO.bizdate[1]}</if>
<if test="reqVO.confirmdate != null "> AND a.confirmdate between #{reqVO.confirmdate[0]} AND #{reqVO.confirmdate[1}</if>

18
hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue
View File

@ -44,6 +44,15 @@
class="!w-240px"
/>
</el-form-item>
<el-form-item label="物流单号" prop="logisticsCode">
<el-input
v-model="queryParams.logisticsCode"
placeholder="请输入物流单号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="业务日期" prop="bizdate">
<el-date-picker
v-model="queryParams.bizdate"
@ -263,6 +272,7 @@
:formatter="dateFormatter2"
width="120px"
/>
<el-table-column label="物流单号" align="center" prop="logisticsCode" width="120px"/>
<el-table-column label="手机" align="center" prop="phone" width="120px"/>
<el-table-column label="备注" align="center" prop="remarks" width="150px"/>
<el-table-column
@ -443,6 +453,7 @@ const queryParams = reactive({
confirmdate: [],
plansenddate: [],
phone: undefined,
logisticsCode: undefined,
remarks: undefined,
})
const queryFormRef = ref() // 搜索的表单
@ -482,11 +493,12 @@ const getList = async () => {
|| (queryParams.customerName && queryParams.customerName.trim().length>0)
|| (queryParams.brandName && queryParams.brandName.trim().length>0)
|| (queryParams.materialName && queryParams.materialName.trim().length>0)
|| (queryParams.logisticsCode && queryParams.logisticsCode.trim().length>0)
|| (queryParams.phone && queryParams.phone.trim().length>0)
|| (queryParams.remarks && queryParams.remarks.trim().length>0)
|| (queryParams.bizdate && queryParams.bizdate.trim().length>0)
|| (queryParams.confirmdate && queryParams.confirmdate.trim().length>0)
|| (queryParams.plansenddate && queryParams.plansenddate.trim().length>0)
|| (queryParams.bizdate && queryParams.bizdate.length>0)
|| (queryParams.confirmdate && queryParams.confirmdate.length>0)
|| (queryParams.plansenddate && queryParams.plansenddate.length>0)
){
querySumTotalQtyOpen.value = true
querySumTotalQty.value = data.otherMap['querySumTotalQty']

8
hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/index.vue
View File

@ -17,10 +17,10 @@
class="!w-240px"
/>
</el-form-item>
<el-form-item :label="t('saleorder.customer')" prop="customerId">
<el-form-item :label="t('saleorder.logisticsCode')" prop="logisticsCode">
<el-input
v-model="queryParams.customerId"
:placeholder="t('billform.pleaseenter')+''+t('saleorder.customer')"
v-model="queryParams.logisticsCode"
:placeholder="t('billform.pleaseenter')+''+t('saleorder.logisticsCode')"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
@ -219,6 +219,7 @@
width="120px"
/>
<el-table-column :label="t('saleorder.phone')" align="center" prop="phone" width="120"/>
<el-table-column :label="t('saleorder.logisticsCode')" align="center" prop="logisticsCode" width="150"/>
<el-table-column :label="t('saleorder.remarks')" align="center" prop="remarks" width="150"/>
<el-table-column
:label="t('saleorder.createTime')"
@ -392,6 +393,7 @@ const queryParams = reactive({
confirmdate: [],
plansenddate: [],
phone: undefined,
logisticsCode: undefined,
remarks: undefined,
})
const queryFormRef = ref() // 搜索的表单