最新版本541200007

jiangping

2024-12-11 88c3d89fb18415722b1f3b57cbec3d3593cc587f

最新版本541200007

 server/system_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -1167,7 +1167,7 @@
        ;
        // æˆå‘˜å˜é‡
        private int key;
        private int type;//用户类型 0员工 1司机
        private int type;//用户类型 0员工 1司机 2访客
        private String yw;//业务类型
        private String info;//说明


 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java

@@ -20,4 +20,7 @@
    private String   toRepertoty    ;//    å¦    å­—符串    åˆ°è´§åœ°
    private String  provinceName    ;//    å¦    å­—符串    åˆ°è´§åœ°çœä»½

    private String    phoneNumber    ;//否    å­—符串    æ‰‹æœºå·
    private String    code    ;//否    éªŒè¯ç 

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsContractListResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
package com.doumee.core.tms.model.response;

import io.swagger.annotations.ApiModel;
import lombok.Data;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2023/11/23 14:03
 */
@Data
@ApiModel("tms查询合同列表请求返回参数")
public class TmsContractListResponse {
   /**
    {
        "code": 0,
        "data": [
            {
                "fromRepertoty": "合肥成品库",
                "ncCreateDate": "2023-12-04 10:36:15",
                "toRepertoty": "天津市中心仓库",
                "contractNumber": "112308335",
                "orderStatus": "到达卸货地"
            }
        ],
        "message": "操作成功"
    }
    */
   private String  contractNumber    ;//合同号
   private String  fromRepertoty    ;//发货地
   private String toRepertoty    ;//到货地
   private String plateNumber    ;//车牌号    åˆåŒæœªé…è½½åˆ™æ— 
   private String orderStatus    ;//当前运输单状态
   private String  ncCreateDate;//    åˆ¶å•æ—¶é—´

}

 server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java

@@ -35,4 +35,5 @@
    private String  ncCreateDate; //    åˆ¶å•æ—¶é—´



}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java

@@ -19,13 +19,16 @@
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.core.wms.model.response.WmsInventoryDataResponse;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.impl.SmsEmailServiceImpl;
import com.doumee.service.business.third.TmsService;
import com.doumee.service.business.third.WmsService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -39,6 +42,9 @@
@Service
@Slf4j
public class TmsServiceImpl implements TmsService {

    @Autowired
    private SmsEmailMapper smsEmailMapper;
    @Autowired
    private PlatformWmsJobMapper platformWmsJobMapper;
    @Autowired
@@ -55,7 +61,8 @@
    private SystemDictDataBiz systemDictDataBiz;
    @Autowired
    private WmsInterfaceLogMapper wmsInterfaceLogMapper;

    @Value("${debug_model}")
    private Boolean isDebug;
    /**
     * ç”µå­é”ä¸Šé”æ—¶é—´æŽ¥å£
     * æ ¹æ®åˆåŒå·ï¼ŒæŸ¥è¯¢ç”µå­é”ä¸Šé”æƒ…况；存在批量查询的情况；
@@ -80,6 +87,7 @@
     */
    @Override
    public  TmsBaseResponse<List<TmsOrderListResponse>> orderList(TmsOrderListRequest param){
        SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,param.getPhoneNumber(),param.getCode());
        String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
                    +systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_ORDER_LIST_URL).getCode();
        TmsBaseResponse<List<TmsOrderListResponse>> response = sendHttpRequest(url,"合同列表接口",JSONObject.toJSONString(param)

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java

@@ -35,7 +35,7 @@

    /**
     * åˆåŒåˆ—表接口
     * æ ¹æ®åŒºåŸŸID集合+筛选条件（合同号、制单开始日期、制单结束日期、发货地、到货地、省份，非需要），返回合同列表信息，按照时间倒序展示；
     * æ ¹æ®åŒºåŸŸID集合+筛选条件（合同号、制单开始日期、制单结束日期、发货地、到货地、省份、手机号，非需要），返回合同列表信息，按照时间倒序展示；
     * @param param å‚æ•°
     * @return TmsBaseResponse
     */