diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index ee7778f9..aa2da191 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -48,6 +48,11 @@ + + + + @@ -1006,6 +1011,11 @@ export default { // 如果没有设置itemType,则设置为raw_material query.selectType = this.querys.materialType === '原料' ? 'raw_material' : 'product'; if (this.showWaybill) { + const { shipmentTime, ...query } = { + ...this.queryParams, + startTime: this.queryParams.shipmentTime?.[0], + endTime: this.queryParams.shipmentTime?.[1], + } listBoundCoil(query).then(res => { this.materialCoilList = res.rows || []; this.total = res.total; diff --git a/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillDetailController.java b/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillDetailController.java index 587b00ea..3130c895 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillDetailController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillDetailController.java @@ -3,6 +3,7 @@ package com.klp.controller; import java.util.List; import java.util.Arrays; import java.util.Date; +import org.springframework.format.annotation.DateTimeFormat; import com.klp.domain.vo.WmsMaterialCoilBindVo; import lombok.RequiredArgsConstructor; @@ -119,8 +120,8 @@ public class WmsDeliveryWaybillDetailController extends BaseController { public TableDataInfo boundCoilList( WmsMaterialCoilBo bo, PageQuery pageQuery, - @RequestParam(required = false) Date startTime, - @RequestParam(required = false) Date endTime) { + @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime, + @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime) { List boundCoilIds; if (startTime != null || endTime != null) { boundCoilIds = iWmsDeliveryWaybillDetailService.getBoundCoilIdsByTimeRange(startTime, endTime);