Merge branch 'master_0929' into master_after20

# Conflicts:
#	xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/contract/ContractDistributorStandardController.java

@@ -449,6 +449,12 @@ public class GetContractDistributorStandardBo extends BaseBo<ContractDistributor
     @ApiModelProperty(value = "是否展示标准合同审核按钮")
     private Boolean standardShowExamine;
 
+    /**
+     * 合同状态
+     */
+    @ApiModelProperty(value = "合同状态")
+    private String shippingStatusName;
+
     public GetContractDistributorStandardBo() {
 
     }

@@ -192,9 +192,9 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut
     private Boolean standardShowExamine;
 
     /**
-     * 发货状态
+     * 合同状态
      */
-    @ApiModelProperty(value = "发货状态")
+    @ApiModelProperty(value = "合同状态")
     private String shippingStatusName;
 
     /**

@@ -31,18 +31,17 @@ import com.lframework.xingyun.sc.bo.contract.GetContractDistributorStandardBo;
 import com.lframework.xingyun.sc.bo.contract.GetContractStdProcessingLineBo;
 import com.lframework.xingyun.sc.bo.contract.QueryContractDistributorStandardBo;
 import com.lframework.xingyun.sc.components.code.GenerateCodeTypePool;
-import com.lframework.xingyun.sc.entity.ContractDistributorLine;
-import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
-import com.lframework.xingyun.sc.entity.ContractFramework;
-import com.lframework.xingyun.sc.entity.ContractStdProcessingLine;
+import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorLineService;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
 import com.lframework.xingyun.sc.service.contract.ContractFrameworkService;
 import com.lframework.xingyun.sc.service.contract.ContractStdProcessingLineService;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.utils.LatexFormulaExcelExporterUtil;
 import com.lframework.xingyun.sc.vo.contract.createVo.CreateContractDistributorStandardVo;
 import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractDistributorStandardVo;
 import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractDistributorStandardVo;
+import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiModelProperty;
@@ -59,6 +58,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
@@ -107,6 +107,8 @@ public class ContractDistributorStandardController extends DefaultBaseController
     private ContractFrameworkService contractFrameworkService;
     @Autowired
     private ContractStdProcessingLineService contractStdProcessingLineService;
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
 
 
     public static final String SUPPLIER_DIC_CODE = "SUPPLIER"; // 所属单位/供方
@@ -255,6 +257,55 @@ public class ContractDistributorStandardController extends DefaultBaseController
                 Customer customer = customerMap.get(bo.getStockUpCompanyId());
                 bo.setStockUpCompanyName(customer == null ? "" : customer.getName());
             }
+            //合同状态(标准合同列表展示)
+            if (vo != null && "STANDARD".equals(vo.getStatus())) {
+                //合同ID
+                String id = bo.getId();
+                QueryPurchaseOrderInfoVo vo1 = new QueryPurchaseOrderInfoVo();
+                vo1.setContractId(id);
+                vo1.setExamineStatus("AUDIT");
+                vo1.setType("PRODUCTION");
+                List<PurchaseOrderInfo> query1 = purchaseOrderInfoService.query(vo1);
+                if (CollectionUtils.isNotEmpty(query1)) {
+                    bo.setShippingStatusName("审批中");
+                } else {
+                    QueryPurchaseOrderInfoVo vo2 = new QueryPurchaseOrderInfoVo();
+                    vo2.setContractId(id);
+                    vo2.setStatus("ISSUED");
+                    vo2.setType("PRODUCTION");
+                    List<PurchaseOrderInfo> query2 = purchaseOrderInfoService.query(vo2);
+                    if (CollectionUtils.isNotEmpty(query2)) {
+                        bo.setShippingStatusName("生产中");
+                    } else {
+                        QueryPurchaseOrderInfoVo vo3 = new QueryPurchaseOrderInfoVo();
+                        vo3.setContractId(id);
+                        vo3.setStatus("TRANSIT");
+                        vo3.setType("PRODUCTION");
+                        List<PurchaseOrderInfo> query3 = purchaseOrderInfoService.query(vo3);
+                        if (CollectionUtils.isNotEmpty(query3)) {
+                            bo.setShippingStatusName("已发货");
+                        } else {
+                            QueryPurchaseOrderInfoVo vo4 = new QueryPurchaseOrderInfoVo();
+                            vo4.setContractId(id);
+                            vo4.setStatus("SHIPPED");
+                            vo4.setType("PRODUCTION");
+                            List<PurchaseOrderInfo> query4 = purchaseOrderInfoService.query(vo4);
+                            if (CollectionUtils.isNotEmpty(query4)) {
+                                bo.setShippingStatusName("已发货");
+                            } else {
+                                QueryPurchaseOrderInfoVo vo5 = new QueryPurchaseOrderInfoVo();
+                                vo5.setContractId(id);
+                                vo5.setStatus("DELIVERED");
+                                vo5.setType("PRODUCTION");
+                                List<PurchaseOrderInfo> query5 = purchaseOrderInfoService.query(vo5);
+                                if (CollectionUtils.isNotEmpty(query5)) {
+                                    bo.setShippingStatusName("已签收");
+                                }
+                            }
+                        }
+                    }
+                }
+            }
         });
 
         boPageResult.setDatas(boList);
@@ -364,6 +415,53 @@ public class ContractDistributorStandardController extends DefaultBaseController
             Customer customer1 = customerService.findById(result.getStockUpCompanyId());
             result.setStockUpCompanyName(customer1 == null ? null : customer1.getName());
         }
+        //合同状态(标准合同列表展示)
+        if ("STANDARD".equals(data.getStatus())) {
+            QueryPurchaseOrderInfoVo vo1 = new QueryPurchaseOrderInfoVo();
+            vo1.setContractId(id);
+            vo1.setExamineStatus("AUDIT");
+            vo1.setType("PRODUCTION");
+            List<PurchaseOrderInfo> query1 = purchaseOrderInfoService.query(vo1);
+            if (CollectionUtils.isNotEmpty(query1)) {
+                result.setShippingStatusName("审批中");
+            } else {
+                QueryPurchaseOrderInfoVo vo2 = new QueryPurchaseOrderInfoVo();
+                vo2.setContractId(id);
+                vo2.setStatus("ISSUED");
+                vo2.setType("PRODUCTION");
+                List<PurchaseOrderInfo> query2 = purchaseOrderInfoService.query(vo2);
+                if (CollectionUtils.isNotEmpty(query2)) {
+                    result.setShippingStatusName("生产中");
+                } else {
+                    QueryPurchaseOrderInfoVo vo3 = new QueryPurchaseOrderInfoVo();
+                    vo3.setContractId(id);
+                    vo3.setStatus("TRANSIT");
+                    vo3.setType("PRODUCTION");
+                    List<PurchaseOrderInfo> query3 = purchaseOrderInfoService.query(vo3);
+                    if (CollectionUtils.isNotEmpty(query3)) {
+                        result.setShippingStatusName("已发货");
+                    } else {
+                        QueryPurchaseOrderInfoVo vo4 = new QueryPurchaseOrderInfoVo();
+                        vo4.setContractId(id);
+                        vo4.setStatus("SHIPPED");
+                        vo4.setType("PRODUCTION");
+                        List<PurchaseOrderInfo> query4 = purchaseOrderInfoService.query(vo4);
+                        if (CollectionUtils.isNotEmpty(query4)) {
+                            result.setShippingStatusName("已发货");
+                        } else {
+                            QueryPurchaseOrderInfoVo vo5 = new QueryPurchaseOrderInfoVo();
+                            vo5.setContractId(id);
+                            vo5.setStatus("DELIVERED");
+                            vo5.setType("PRODUCTION");
+                            List<PurchaseOrderInfo> query5 = purchaseOrderInfoService.query(vo5);
+                            if (CollectionUtils.isNotEmpty(query5)) {
+                                result.setShippingStatusName("已签收");
+                            }
+                        }
+                    }
+                }
+            }
+        }
 
         return InvokeResultBuilder.success(result);
     }

@@ -11,15 +11,19 @@ import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.xingyun.sc.bo.shipments.car.GetDraftRequestCarTicketBo;
 import com.lframework.xingyun.sc.entity.DraftRequestCarTicket;
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
 import com.lframework.xingyun.sc.vo.shipments.car.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import java.util.List;
@@ -37,7 +41,8 @@ public class DraftRequestCarTicketController extends DefaultBaseController {
 
     @Autowired
     private DraftRequestCarTicketService draftRequestCarTicketService;
-
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
     /**
      * 查询列表
      */
@@ -56,9 +61,13 @@ public class DraftRequestCarTicketController extends DefaultBaseController {
 
             results = datas.stream().map(draftRequestCarTicket -> {
                 GetDraftRequestCarTicketBo bo = new GetDraftRequestCarTicketBo(draftRequestCarTicket);
+                PurchaseOrderInfo purchaseOrderInfo = null;
+                if (StringUtils.isNotEmpty(draftRequestCarTicket.getPurchaseOrderId())) {
+                    purchaseOrderInfo = purchaseOrderInfoService.findById(draftRequestCarTicket.getPurchaseOrderId());
+                }
                 // 判断 createById 是否等于当前用户 ID
                 boolean isCreateBy = false;
-                if (currentUserId.equals(draftRequestCarTicket.getCreateById())) {
+                if (purchaseOrderInfo != null && currentUserId.equals(purchaseOrderInfo.getContractCreateById())) {
                     isCreateBy = true;
                 }
                 bo.setDraftCreateBy(isCreateBy);
@@ -87,6 +96,14 @@ public class DraftRequestCarTicketController extends DefaultBaseController {
         }
 
         GetDraftRequestCarTicketBo result = new GetDraftRequestCarTicketBo(data);
+        result.setDraftCreateBy(false);
+        if (StringUtils.isNotEmpty(result.getPurchaseOrderId())) {
+            String currentUserId = SecurityUtil.getCurrentUser().getId();
+            PurchaseOrderInfo purchaseOrderInfo = purchaseOrderInfoService.findById(result.getPurchaseOrderId());
+            if (purchaseOrderInfo != null && currentUserId.equals(purchaseOrderInfo.getContractCreateById())) {
+                result.setDraftCreateBy(true);
+            }
+        }
 
         return InvokeResultBuilder.success(result);
     }

@@ -65,6 +65,18 @@ public class SpecLockDelayApplication extends BaseEntity implements BaseDto {
     private LocalDateTime approvedAt;
 
     /**
+     * 生产厂编码(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String workshopCode;
+
+    /**
+     * 办事处编码(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String deptCode;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -57,9 +57,9 @@ public class ContractFrameworkExportModel extends BaseBo<ContractFramework> impl
     private String materialTypeName;
 
     /**
-     * 授信截止日期
+     * 授时截止日期
      */
-    @ExcelProperty("授信截止日期")
+    @ExcelProperty("授时截止日期")
     @DateTimeFormat(StringPool.DATE_PATTERN)
     private Date validityTime;
 

@@ -77,7 +77,7 @@ public class ContractFrameworkImportListener extends ExcelImportListener<Contrac
 
         if (null == data.getValidityTime()) {
             throw new DefaultClientException(
-                    "第" + context.readRowHolder().getRowIndex() + "行授信截止日期不可为空");
+                    "第" + context.readRowHolder().getRowIndex() + "行授时截止日期不可为空");
         }
 
         if (StringUtils.isBlank(data.getMaterialTypeName())) {

@@ -60,11 +60,11 @@ public class ContractFrameworkImportModel implements ExcelModel {
     private String materialTypId;
 
     /**
-     * 授信截止日期
+     * 授时截止日期
      */
     @ExcelRequired
     @DateTimeFormat(StringPool.DATE_PATTERN)
-    @ExcelProperty("授信截止日期")
+    @ExcelProperty("授时截止日期")
     private Date validityTime;
 
 }

@@ -22,7 +22,11 @@ import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
+import com.lframework.starter.web.inner.entity.SysDept;
+import com.lframework.starter.web.inner.service.system.SysDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserRoleService;
+import com.lframework.xingyun.basedata.entity.Workshop;
+import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
 import com.lframework.xingyun.sc.entity.SpecLockDelayApplication;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
@@ -58,7 +62,7 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
 
     @Autowired
     private FlowInstanceWrapperService flowInstanceWrapperService;
-    @Autowired
+    @Resource
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
     @Autowired
     private ContractDistributorStandardService contractDistributorStandardService;
@@ -68,6 +72,10 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
     private MqProducerService mqProducerService;
     @Resource
     private SysUserRoleService sysUserRoleService;
+    @Resource
+    private WorkshopService workshopService;
+    @Resource
+    private SysDeptService sysDeptService;
 
     @Override
     public PageResult<SpecLockDelayApplication> query(Integer pageIndex, Integer pageSize, QuerySpecLockDelayApplicationVo vo) {
@@ -127,6 +135,14 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
         OpLogUtil.setExtra(vo);
 
         // 开启审核
+        data.setCreateById(SecurityUtil.getCurrentUser().getId());
+        ContractDistributorStandard standard = contractDistributorStandardService.findById(vo.getContractId());
+        if (standard != null) {
+            Workshop workshop = workshopService.findById(standard.getWorkshopId());
+            data.setWorkshopCode(workshop == null ? "" : workshop.getCode());
+            SysDept sysDept = sysDeptService.findById(standard.getDeptId());
+            data.setDeptCode(sysDept == null ? "" : sysDept.getCode());
+        }
         flowInstanceWrapperService.startInstance(SPEC_LOCK_DELAY_FLAY, data.getId(), SPEC_LOCK_DELAY_FLAY, data);
         return data.getId();
     }
@@ -176,6 +192,13 @@ public class SpecLockDelayApplicationServiceImpl extends BaseMpServiceImpl<SpecL
         OpLogUtil.setExtra(vo);
 
         // 编辑完成再次开启审核
+        ContractDistributorStandard standard = contractDistributorStandardService.findById(data.getContractId());
+        if (standard != null) {
+            Workshop workshop = workshopService.findById(standard.getWorkshopId());
+            data.setWorkshopCode(workshop == null ? "" : workshop.getCode());
+            SysDept sysDept = sysDeptService.findById(standard.getDeptId());
+            data.setDeptCode(sysDept == null ? "" : sysDept.getCode());
+        }
         flowInstanceWrapperService.startInstance(SPEC_LOCK_DELAY_FLAY, data.getId(), SPEC_LOCK_DELAY_FLAY, data);
     }
 

@@ -81,13 +81,22 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
         // 厂房类型处理
         String workshopType = vo.getWorkshopType();
         if ("TYPE_1".equals(workshopType)) {
-            vo.setWorkshopCode("yfc");
+            // 一、二分厂
+            List<String> workshopNameList = new ArrayList<>();
+            workshopNameList.add("一分厂");
+            workshopNameList.add("二分厂");
+            vo.setWorkshopNames(workshopNameList);
         } else if ("TYPE_2".equals(workshopType)) {
-            vo.setWorkshopCode("efc");
+            // 三、四分厂
+            List<String> workshopNameList = new ArrayList<>();
+            workshopNameList.add("三分厂");
+            workshopNameList.add("四分厂");
+            vo.setWorkshopNames(workshopNameList);
         } else if ("TYPE_3".equals(workshopType)) {
-            vo.setWorkshopCode("sfc");
-        } else if ("TYPE_4".equals(workshopType)) {
-            vo.setWorkshopCode("ztfc");
+            // 紫铜分厂
+            List<String> workshopNameList = new ArrayList<>();
+            workshopNameList.add("紫铜分厂");
+            vo.setWorkshopNames(workshopNameList);
         }
         // 待办类型
         String todoType = vo.getTodoType();

@@ -326,7 +326,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         } else {
             List<String> planDetailIds = vo.getPlanDetailIds();
             if (CollectionUtils.isEmpty(planDetailIds)) {
-                throw new DefaultClientException("发货明细id不能为空！");
+                throw new DefaultClientException("请在列表中勾选发货明细！");
             }
             QueryShipmentsPlanDetailVo planDetailVo = new QueryShipmentsPlanDetailVo();
             planDetailVo.setIds(planDetailIds);

@@ -172,8 +172,17 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         }
         vo.setWorkshopId(plan.getWorkshopId());
         // 获取已经存在的明细数据
-        List<String> orderSpecIds = getBaseMapper().getExistsOrderSpecIds(plan.getAfTomoPreShipDate());
-        if (CollectionUtils.isNotEmpty(orderSpecIds)) {
+        LambdaQueryWrapper<ShipmentsPlanDetail> queryWrapper = Wrappers.lambdaQuery(ShipmentsPlanDetail.class);
+        queryWrapper.eq(ShipmentsPlanDetail::getPreShipments, Boolean.FALSE)
+                .eq(ShipmentsPlanDetail::getDelFlag, Boolean.FALSE);
+        List<ShipmentsPlanDetail> detailList = getBaseMapper().selectList(queryWrapper);
+        if (CollectionUtils.isNotEmpty(detailList)) {
+            List<String> orderSpecIds = detailList.stream().map(ShipmentsPlanDetail::getOrderSpecId).collect(Collectors.toList());
+            vo.setOrderSpecIds(orderSpecIds);
+        }
+        detailList = listByPlanId(plan.getId(), true);
+        if (CollectionUtils.isNotEmpty(detailList)) {
+            List<String> orderSpecIds = detailList.stream().map(ShipmentsPlanDetail::getOrderSpecId).collect(Collectors.toList());
             vo.setOrderSpecIds(orderSpecIds);
         }
         // 开启分页
@@ -254,10 +263,12 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
                     orderIds.add(orderId);
                 }
             }
-            QueryShipmentsPlanDetailVo detailVo = new QueryShipmentsPlanDetailVo();
-            detailVo.setOrderSpecIds(orderSpecIds);
-            detailVo.setCompleted(Boolean.TRUE);
-            List<ShipmentsPlanDetail> detailList = query(detailVo);
+            // 获取已经加入过发货计划中的数据
+            LambdaQueryWrapper<ShipmentsPlanDetail> queryWrapper = Wrappers.lambdaQuery(ShipmentsPlanDetail.class);
+            queryWrapper.in(ShipmentsPlanDetail::getOrderSpecId, orderSpecIds)
+                    .eq(ShipmentsPlanDetail::getDelFlag, Boolean.FALSE)
+                    .eq(ShipmentsPlanDetail::getPreShipments, Boolean.FALSE);
+            List<ShipmentsPlanDetail> detailList = getBaseMapper().selectList(queryWrapper);
             if (CollectionUtils.isNotEmpty(detailList)) {
                 List<String> orderSpecIdList = detailList.stream().map(ShipmentsPlanDetail::getOrderSpecId).distinct().collect(Collectors.toList());
                 // 过滤掉已发货的数据

@@ -64,13 +64,4 @@ public interface ShipmentsPlanDetailMapper extends BaseMapper<ShipmentsPlanDetai
      * @return ShipmentsPlanDetail
      */
     ShipmentsPlanDetail findById(@Param("id") String id);
-
-    /**
-     * 获取已经存在的规格ID
-     * 包含预发数据
-     *
-     * @param shipmentsDate 发货日期
-     * @return              List<String>
-     */
-    List<String> getExistsOrderSpecIds(LocalDate shipmentsDate);
 }

@@ -107,4 +107,7 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ
      */
     @ApiModelProperty("搜索关键字")
     private String searchKey;
+
+    @ApiModelProperty("合同")
+    private String contractId;
 }

@@ -82,8 +82,11 @@
             <if test="vo.status != null and vo.status != ''">
                 AND tb.status = #{vo.status}
             </if>
-            <if test="vo.workshopCode != null and vo.workshopCode != ''">
-                AND w.code = #{vo.workshopCode}
+            <if test = "vo.workshopType != null and vo.workshopType != ''">
+                AND w.name in
+                <foreach collection="vo.workshopNames" open="(" separator="," close=")" item="item">
+                    #{item}
+                </foreach>
             </if>
             <if test="vo.createStartTime != null">
                 AND tb.create_time >= #{vo.createStartTime}

@@ -157,6 +157,9 @@
                 AND (cu.name LIKE CONCAT('%', #{vo.orderingUnitNameOrOrderNo},'%')
                 or tb.order_no LIKE CONCAT('%', #{vo.orderingUnitNameOrOrderNo},'%'))
             </if>
+            <if test="vo.contractId != null and vo.contractId != ''">
+                AND tb.contract_id = #{vo.contractId}
+            </if>
         </where>
         ORDER BY tb.update_time DESC
     </select>

@@ -185,7 +185,8 @@
             ol.length,
             ol.length_tol_pos,
             ol.length_tol_neg,
-            ol.quantity
+            ol.quantity,
+            ol.delivery_date as shipments_date
         from tbl_purchase_order_line ol
         inner join purchase_order_info o on ol.purchase_order_id = o.id
         left join base_data_customer c on o.ordering_unit = c.id
@@ -296,10 +297,4 @@
             </if>
         </where>
     </select>
-
-    <select id="getExistsOrderSpecIds" resultType="java.lang.String">
-        select distinct tb.order_spec_id
-        from shipments_plan_detail tb
-        where tb.pre_shipments = false or (tb.pre_shipments = true and tb.shipments_date = #{shipmentsDate})
-    </select>
 </mapper>