Merge remote-tracking branch 'refs/remotes/origin/dev' into dev_user0622

# Conflicts:
#	mhd-user-center/src/main/resources/bootstrap.yml

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java

@@ -1,6 +1,8 @@
 package com.mhd.oms.domain.businessDocumentOrder.repository.persistence;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -43,6 +45,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.rmi.ServerException;
 import java.util.ArrayList;
@@ -169,6 +172,29 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
         return businessDocumentOrderPO;
     }
 
+
+
+    public static String getOrderCodeByDate(Date date){
+        return new StringBuffer()
+                .append(getSecondPartByDate(date))
+                .append(getThreePart())
+                .toString();
+    }
+    private static String getSecondPartByDate(Date date) {
+        if (date == null) {
+            date = new Date();
+        }
+        String temp_current_time = DateUtil.format(date, datePattern());
+        return temp_current_time.substring(2, temp_current_time.length());
+    }
+    private static String datePattern() {
+        return "yyyyMMddHHmmss";
+    }
+    private static String getThreePart() {
+        return RandomUtil.randomNumbers(4);
+    }
+
+
     @Override
     public Boolean audit(List<Long> ids, Long reviewStatus, String SalesManager,String reviewOpinion ) {
         LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
@@ -229,6 +255,31 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
                             subOrder.setRecipientName(user.getUserName());
 
 
+                            String orderCode = null;
+                            int maxRetryCount = 100;
+                            int retryCount = 0;
+
+                            while (retryCount < maxRetryCount) {
+                                orderCode = getOrderCodeByDate(subOrder.getDocumentDate());
+                                retryCount++;
+
+                                List<BusinessDocumentOrder> checkOrderCodes = businessDocumentOrderMapper.selectList(
+                                        new QueryWrapper<BusinessDocumentOrder>().eq("goods_number", orderCode)
+                                );
+
+                                if (CollectionUtils.isEmpty(checkOrderCodes)) {
+                                    break;
+                                }
+
+                                if (retryCount >= maxRetryCount) {
+                                    throw new com.aliyun.oss.ServiceException("生成唯一订单编号失败，已达到最大重试次数：" + maxRetryCount);
+                                }
+                            }
+
+                            //生成货源单号
+                            subOrder.setGoodsNumber(orderCode);
+
+
                             businessDocumentOrderMapper.insert(subOrder);
                             subOrderCount++; // 增加子单计数
 
@@ -706,4 +757,4 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
     {
         return businessDocumentOrderMapper.queryListAndMaterial(businessDocumentOrderDO);
     }
-}
+}

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java

@@ -91,6 +91,8 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
 
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date loadingDate;
 
     @ApiModelProperty("$column.columnComment")
@@ -123,6 +125,8 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
 
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date unloadingData;
 
     @ApiModelProperty("$column.columnComment")
@@ -674,6 +678,8 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
 
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date documentDate;
 
 
@@ -764,6 +770,8 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
     private String entryNumber;
 
     @ApiModelProperty("预计出发日期")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date layDate;
 
     @ApiModelProperty("出入库单号")

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/todo/BusinessDocumentOrderDO.java

@@ -106,6 +106,8 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{
 
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date loadingDate;
 
     @ApiModelProperty("$column.columnComment")
@@ -138,6 +140,8 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{
 
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date unloadingData;
 
     @ApiModelProperty("$column.columnComment")
@@ -741,6 +745,8 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{
     private String paymentAccountId;
 
     @ApiModelProperty("预计出发日期")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date layDate;
 
     @ApiModelProperty("收款账户信息")

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java

@@ -1,10 +1,14 @@
 package com.mhd.oms.domain.businessDocumentOrder.service;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.RandomUtil;
 import com.aliyun.oss.ServiceException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mhd.common.core.domain.entity.TmsOrder;
 import com.mhd.common.core.domain.po.UserShipperPo;
 import com.mhd.common.core.utils.DateUtils;
 import com.mhd.common.core.utils.OrderSequence;
@@ -47,6 +51,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -101,6 +106,25 @@ public class BusinessDocumentOrderDomainService {
         return businessDocumentOrderService.queryList(businessDocumentOrderDO);
     }
 
+    public static String getOrderCodeByDate(Date date){
+        return new StringBuffer()
+                .append(getSecondPartByDate(date))
+                .append(getThreePart())
+                .toString();
+    }
+    private static String getSecondPartByDate(Date date) {
+        if (date == null) {
+            date = new Date();
+        }
+        String temp_current_time = DateUtil.format(date, datePattern());
+        return temp_current_time.substring(2, temp_current_time.length());
+    }
+    private static String datePattern() {
+        return "yyyyMMddHHmmss";
+    }
+    private static String getThreePart() {
+        return RandomUtil.randomNumbers(4);
+    }
 
     /**
      * 新增【请填写功能名称】
@@ -184,6 +208,7 @@ public class BusinessDocumentOrderDomainService {
         BeanUtils.copyProperties(businessDocumentOrderDO, tmsOrder, "id");
         tmsOrder.setSettlementStatus(1L);//未出账
         tmsOrder.setAuditStatus(0L);//未审核
+        tmsOrder.setCustomerCodeNc(customerNcCode);
         tmsOrder.setSzwlUserId(Long.valueOf(u.getUserid()));
         if (tmsOrder.getLoadingDate() != null && tmsOrder.getUnloadingData() != null) {
             if (tmsOrder.getUnloadingData().before(tmsOrder.getLoadingDate())) {
@@ -257,16 +282,41 @@ public class BusinessDocumentOrderDomainService {
         }
 
         //生成货源单号
-        if (businessDocumentOrderDO.getGoodsNumber() == null) {
 
-            tmsOrder.setGoodsNumber(OrderSequence.getOrderCode());
+        String orderCode = null;
+        int maxRetryCount = 100;
+        int retryCount = 0;
+
+        while (retryCount < maxRetryCount) {
+            orderCode = getOrderCodeByDate(tmsOrder.getDocumentDate());
+            retryCount++;
+
+            List<BusinessDocumentOrder> checkOrderCodes = businessDocumentOrderMapper.selectList(
+                    new QueryWrapper<BusinessDocumentOrder>().eq("goods_number", orderCode)
+            );
+
+            if (CollectionUtils.isEmpty(checkOrderCodes)) {
+                break;
+            }
+
+            if (retryCount >= maxRetryCount) {
+                throw new ServiceException("生成唯一订单编号失败，已达到最大重试次数：" + maxRetryCount);
+            }
         }
-        ReservationStockOutOrder reservationStockOutOrder = reservationStockOutOrderMapper.selectOne(new LambdaQueryWrapper<ReservationStockOutOrder>().eq(ReservationStockOutOrder::getOutOrderNumber, tmsOrder.getInOrderNumber()));
+
+        //生成货源单号
+        tmsOrder.setGoodsNumber(orderCode);
+
+        ReservationStockOutOrder reservationStockOutOrder = reservationStockOutOrderMapper.selectOne(new LambdaQueryWrapper<ReservationStockOutOrder>()
+                .eq(ReservationStockOutOrder::getOutOrderNumber, tmsOrder.getInOrderNumber())
+                .eq(ReservationStockOutOrder::getDelFlag, 1));
         if (reservationStockOutOrder != null){
             reservationStockOutOrder.setBusinessNumber(tmsOrder.getGoodsNumber());
             reservationStockOutOrderMapper.updateById(reservationStockOutOrder);
         }
-        ReservationStockInOrder reservationStockInOrder = reservationStockInOrderMapper.selectOne(new LambdaQueryWrapper<ReservationStockInOrder>().eq(ReservationStockInOrder::getInOrderNumber, tmsOrder.getInOrderNumber()));
+        ReservationStockInOrder reservationStockInOrder = reservationStockInOrderMapper.selectOne(new LambdaQueryWrapper<ReservationStockInOrder>()
+                .eq(ReservationStockInOrder::getInOrderNumber, tmsOrder.getInOrderNumber())
+                .eq(ReservationStockInOrder::getDelFlag, 1));
         if (reservationStockInOrder != null){
             reservationStockInOrder.setBusinessNumber(tmsOrder.getGoodsNumber());
             reservationStockInOrderMapper.updateById(reservationStockInOrder);
@@ -392,7 +442,7 @@ public class BusinessDocumentOrderDomainService {
             tmsOrder.setSplicingOrderType(0L); // 普通单
         }
         //一天后
-        tmsOrder.setDocumentDate(DateUtils.addHours(new Date(), 24));
+        tmsOrder.setDocumentDate(businessDocumentOrderDO.getDocumentDate());
 
         boolean istrue = businessDocumentOrderMapper.insert(tmsOrder) > 0;
 
@@ -474,6 +524,7 @@ public class BusinessDocumentOrderDomainService {
             throw new ServiceException("您非货主角色或账号已被删除!");
         }
         BusinessDocumentOrder tmsOrder = businessDocumentOrderService.getById(businessDocumentOrderDO.getId());
+        String inOrderNumber = tmsOrder.getInOrderNumber();
         if (tmsOrder.getOrderStatus() == 1){
             tmsOrder.setOrderStatus(0L);
         }
@@ -484,6 +535,7 @@ public class BusinessDocumentOrderDomainService {
             throw new ServiceException("运单已被关闭，请确认！");
         }
         //处理费用默认值
+        tmsOrder.setDocumentDate(businessDocumentOrderDO.getDocumentDate());
         handFee(businessDocumentOrderDO);
         //组织赋值
         Long organizationId = businessDocumentOrderDO.getOrganizationId();
@@ -679,6 +731,45 @@ public class BusinessDocumentOrderDomainService {
         }
 //        boolean istrue=businessDocumentOrderService.update(businessDocumentOrderDO);
 
+
+        String orderCode = null;
+        int maxRetryCount = 100;
+        int retryCount = 0;
+
+        while (retryCount < maxRetryCount) {
+            orderCode = getOrderCodeByDate(tmsOrder.getDocumentDate());
+            retryCount++;
+
+            List<BusinessDocumentOrder> checkOrderCodes = businessDocumentOrderMapper.selectList(
+                    new QueryWrapper<BusinessDocumentOrder>().eq("goods_number", orderCode)
+            );
+
+            if (CollectionUtils.isEmpty(checkOrderCodes)) {
+                break;
+            }
+
+            if (retryCount >= maxRetryCount) {
+                throw new ServiceException("生成唯一订单编号失败，已达到最大重试次数：" + maxRetryCount);
+            }
+        }
+
+        //生成货源单号
+        tmsOrder.setGoodsNumber(orderCode);
+
+        ReservationStockOutOrder reservationStockOutOrder = reservationStockOutOrderMapper.selectOne(new LambdaQueryWrapper<ReservationStockOutOrder>()
+                .eq(ReservationStockOutOrder::getOutOrderNumber, inOrderNumber)
+                .eq(ReservationStockOutOrder::getDelFlag, 1));
+        if (reservationStockOutOrder != null){
+            reservationStockOutOrder.setBusinessNumber(tmsOrder.getGoodsNumber());
+            reservationStockOutOrderMapper.updateById(reservationStockOutOrder);
+        }
+        ReservationStockInOrder reservationStockInOrder = reservationStockInOrderMapper.selectOne(new LambdaQueryWrapper<ReservationStockInOrder>()
+                .eq(ReservationStockInOrder::getInOrderNumber, inOrderNumber)
+                .eq(ReservationStockInOrder::getDelFlag, 1));
+        if (reservationStockInOrder != null){
+            reservationStockInOrder.setBusinessNumber(tmsOrder.getGoodsNumber());
+            reservationStockInOrderMapper.updateById(reservationStockInOrder);
+        }
         int i = businessDocumentOrderMapper.updateById(tmsOrder);
         if (deliveryFreight != null && deliveryFreight.compareTo(BigDecimal.ZERO) > 0){
             List<ReservationOrder> reservationOrderList = reservationOrderMapper.selectList(new LambdaQueryWrapper<ReservationOrder>().eq(ReservationOrder::getGoodsNumber, businessDocumentOrderDO.getGoodsNumber()));

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java

@@ -31,6 +31,7 @@ public class ExecuteOrderPO extends BaseVOEntity{
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long id;
 
+
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String realCreateBy;
@@ -123,6 +124,8 @@ public class ExecuteOrderPO extends BaseVOEntity{
     private String  jobStatus;
 
     @ApiModelProperty("预计运输时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date  documentDate;
 
     @ApiModelProperty("备注")
@@ -150,6 +153,8 @@ public class ExecuteOrderPO extends BaseVOEntity{
 
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date loadingDate;
 
     @ApiModelProperty("$column.columnComment")
@@ -188,6 +193,8 @@ public class ExecuteOrderPO extends BaseVOEntity{
 
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date layDate;
 
     @ApiModelProperty("$column.columnComment")

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java

@@ -172,4 +172,14 @@ public class ExecuteOrderDO extends BaseVOEntity{
 
     @ApiModelProperty("车次")
     private Integer trainNo;
+
+    @ApiModelProperty("预计开始日期")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date documentStartTime;
+
+    @ApiModelProperty("预计结束日期")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date documentEndTime;
 }

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentAddressMulti/BusinessDocumentAddressMultiDTO.java

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import java.math.BigDecimal;
 import io.swagger.annotations.ApiModelProperty;
 import com.mhd.common.core.web.domain.BaseVOEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.List;
 
@@ -71,6 +72,8 @@ public class BusinessDocumentAddressMultiDTO extends BaseVOEntity{
 
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date layDate;
 
     @ApiModelProperty("$column.columnComment")

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java

@@ -94,6 +94,8 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
 
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date loadingDate;
 
     @ApiModelProperty("$column.columnComment")
@@ -126,6 +128,8 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
 
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date unloadingData;
 
     @ApiModelProperty("$column.columnComment")
@@ -673,8 +677,8 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
 
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
-//    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date documentDate;
 
 
@@ -770,6 +774,8 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
     private String entryNumber;
 
     @ApiModelProperty("预计出发日期")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date layDate;
 
     @ApiModelProperty("入库单号")

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java

@@ -162,4 +162,14 @@ public class ExecuteOrderDTO extends BaseVOEntity{
     @ApiModelProperty("车次")
     private Integer trainNo;
 
+    @ApiModelProperty("预计开始日期")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date documentStartTime;
+
+    @ApiModelProperty("预计结束日期")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date documentEndTime;
+
 }

mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml

@@ -69,6 +69,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="invoiceEndTime != null">
                 and eo.INVOICE_DATE <![CDATA[ < ]]> DATEADD(DAY, 1, #{invoiceEndTime,jdbcType=DATE})
             </if>
+            <if test="documentStartTime != null">
+                and eo.DOCUMENT_DATE >= #{documentStartTime,jdbcType=DATE}
+            </if>
+            <if test="documentEndTime != null">
+                and eo.DOCUMENT_DATE <![CDATA[ < ]]> DATEADD(DAY, 1, #{documentEndTime,jdbcType=DATE})
+            </if>
 <!--            <if test="invoiceStartTime != null">-->
 <!--            and eo.INVOICE_DATE >= #{invoiceStartTime}-->
 <!--        </if>-->