Merge remote-tracking branch 'origin/master'

jiangping

2025-03-31 5eb2c5d2396f1a3764dcc029185f139a427ba18f

Merge remote-tracking branch 'origin/master'

 admin/.env.production

@@ -1,4 +1,4 @@
# 生产环境配置
NODE_ENV = 'production'

# VUE_APP_API_URL  = 'http://10.50.250.178:8088/gateway_interface'
VUE_APP_API_URL  = 'http://10.50.250.178:8088/gateway_interface'

 admin/src/views/task/driverDetail.vue

@@ -29,7 +29,7 @@
              <div class="value">前 {{ info.carCodeFront }}，后 {{ info.carCodeBack }}</div>
            </div>
            <div class="item">
              <div class="label">合同编号</div>
              <div class="label">合同/单据编号</div>
              <div class="value">{{ info.contractNum }}</div>
            </div>
            <div class="item">
@@ -37,7 +37,7 @@
              <div class="value">{{ info.arriveDate }}</div>
            </div>
            <div class="item">
              <div class="label">入库类型</div>
              <div class="label">作业类型</div>
              <div class="value">{{ info.inType == 0 ? '整托盘' : '件烟' }}</div>
            </div>
            <div class="item">
@@ -45,7 +45,7 @@
              <div class="value">{{ info.totalNum || info.ioQty }}万支</div>
            </div>
            <div class="item">
              <div class="label">准运证照片</div>
              <div class="label">准运证/运单照片</div>
              <div v-if="info.transportImg" class="value">
                <el-image style="width: 100px" :preview-src-list="[info.prefixUrl + info.transportImg]"
                  :src="info.prefixUrl + info.transportImg" alt="" />

 h5/api/visitor.js

@@ -87,6 +87,13 @@
    method: 'get'
  })
}
// 取消预约--访客
export const visitsSelfCancel = (visitId, memberId) => {
  return http({
    url: `visitsAdmin/cloudService/web/visitor/visitsSelfCancel?visitId=${visitId}&memberId=${memberId}`,
    method: 'get'
  })
}
// 来访事由
export const getVisitReason = (data) => {
  return http({

 h5/pages/appointmentDetails/appointmentDetails.vue

@@ -85,12 +85,8 @@
        <view class="box_list_item_val">{{ info.carNos }}</view>
      </view>
    </view>
    <view class="footer">
        <u-button
        text="取消预约"
        size="mini"
        v-if="[0,1,2,5].includes(info.status)"
        @click="cancelShow = true" />
    <view class="padding_wrap">
        <view class="btn" v-if="[0,1,2,5].includes(info.status)" @click="cancelShow = true">取消预约</view>
    </view>
    <u-popup :show="show" mode="center" @close="close">
      <view class="qrocde">
@@ -110,7 +106,7 @@

<script>
import wxcode from 'uniapp-qrcode'
import { getVisitedDetail } from '@/api'
import { getVisitedDetail, visitsSelfCancel } from '@/api'

export default {
  data() {
@@ -156,7 +152,9 @@
  methods: {
    // 取消预约
    cancel() {
        visitsCancel(this.id).then(res => {
        const member = uni.getStorageSync('member');
        visitsSelfCancel(this.id, member.id).then(res => {
            this.cancelShow = false
            this.getDetail(this.id)
        })
    },
@@ -194,15 +192,27 @@
<style lang="scss" scoped>
.box {
  width: 100%;
  .footer {
      position: fixed;
      left: 0;
      bottom: 0;
      width: 100%;
      height: 100rpx;
      text-align: right;
      background-color: #ffffff;
      padding-bottom: calc(30rpx + env(safe-area-inset-bottom));
  .padding_wrap {
      position: fixed;
      z-index: 999;
      padding: 0 30rpx 64rpx;
      bottom: 0;
      left: 0;
      width: 100%;
      display: flex;
      justify-content: space-between;
  
      .btn {
          height: 96rpx;
          line-height: 96rpx;
          text-align: center;
          width: 100%;
          font-size: 36rpx;
          color: #333333;
          background: #ffffff;
          border-radius: 48rpx;
          border: 1rpx solid #999999;
      }
  }
  .qrocde {
    width: 300rpx;

 h5/pages/driver/reservedDetail.vue

@@ -15,7 +15,7 @@
        <view class="value">{{info.inReason}}</view>
      </view>
      <view class="item">
        <view class="label">合同编号</view>
        <view class="label">合同/单据编号</view>
        <view class="value">{{info.contractNum}}</view>
      </view>
            <view class="item">
@@ -23,7 +23,7 @@
              <view class="value" v-if="info.arriveDate">{{info.arriveDate.slice(0,16)}}</view>
            </view>
            <view class="item">
              <view class="label">准运证照片</view>
              <view class="label">准运证/运单照片</view>
              <view class="value">
                    <image
                        v-if="info.transportImg"
@@ -34,7 +34,7 @@
                </view>
            </view>
            <view class="item">
              <view class="label">入库类型</view>
              <view class="label">作业类型</view>
              <view class="value">{{info.inType == 0 ? '整托盘' : '件烟'}}</view>
            </view>
            <view class="item">

 h5/pages/driver/reservedRecord.vue

@@ -9,7 +9,7 @@
                </view>

                <view class="box_list_item_nr">

                    <view class="box_list_item_nr_item">

                        <text>合同编号：</text>

                        <text>合同/单据编号：</text>

                        <text>{{item.contractNum}}</text>

                    </view>

                    <view class="box_list_item_nr_item">


 h5/pages/driver/taskConfirm.vue

@@ -24,7 +24,7 @@
                </view>
            </view>
            <view class="line" v-else>
                <view class="label">合同编号</view>
                <view class="label">合同/单据编号</view>
                <view class="value">{{param.contractNum}}</view>
            </view>
            <view class="line" v-if="type != 4">
@@ -35,7 +35,7 @@
                <view class="value" v-if="param.type == 3">外协车装货</view>
            </view>
            <view class="line" v-if="type == 4">
                <view class="label">入库类型</view>
                <view class="label">作业类型</view>
                <view class="value" v-if="param.inType == 0">整托盘</view>
                <view class="value" v-if="param.inType == 1">件烟</view>
            </view>

 h5/pages/driver/taskDetail.vue

@@ -41,11 +41,11 @@
            </template>

            <template v-else>

                <view class="line">

                    <view class="label">合同编号</view>

                    <view class="label">合同/单据编号</view>

                    <view class="value">{{param.contractNum}}</view>

                </view>

                <view class="line">

                    <view class="label">入库类型</view>

                    <view class="label">作业类型</view>

                    <view class="value">{{param.inType == 0 ? '整托盘' : '件烟'}}</view>

                </view>

                <view class="line">


 h5/pages/staff/task/driver.vue

@@ -18,7 +18,7 @@
        <view class="value">{{info.inReason}}</view>
      </view>
      <view class="item">
        <view class="label">合同编号</view>
        <view class="label">合同/单据编号</view>
        <view class="value">{{info.contractNum}}</view>
      </view>
            <view class="item">
@@ -26,7 +26,7 @@
              <view v-if="info.arriveDate" class="value">{{info.arriveDate.slice(0,16)}}</view>
            </view>
            <view class="item">
              <view class="label">准运证照片</view>
              <view class="label">准运证/运单照片</view>
              <view class="value">
                    <image
                    @click="priviewImage(info.prefixUrl + info.transportImg)"
@@ -37,7 +37,7 @@
                </view>
            </view>
            <view class="item">
              <view class="label">入库类型</view>
              <view class="label">作业类型</view>
              <view class="value">{{info.inType == 0 ? '整托盘' : '件烟'}}</view>
            </view>
            <view class="item">

 screen/src/views/TaskEfficiency.vue

@@ -499,7 +499,7 @@
      {
        name: '分时作业量',
        type: 'bar',
        barWidth: 15,
        barWidth: 10,
        label: {
          show: false,
          position: 'top',
@@ -509,11 +509,11 @@
          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
            {
              offset: 0,
              color: '#63d6fa'
              color: 'rgba(0, 208, 221, 1)'
            },
            {
              offset: 1,
              color: '#32718d'
              color: 'rgba(0, 194, 255, 0.20)'
            }
          ], false),
          lineStyle: {
@@ -527,7 +527,7 @@
      {
        name: '累计作业量',
        type: 'bar',
        barWidth: 15,
        barWidth: 10,
        label: {
          show: false,
          position: 'top',
@@ -537,11 +537,11 @@
          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
            {
              offset: 0,
              color: '#63d6fa'
              color: 'rgba(0, 86, 255, 1)'
            },
            {
              offset: 1,
              color: '#32718d'
              color: 'rgba(0, 86, 255, 0.20)'
            }
          ], false),
          lineStyle: {

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java

@@ -145,6 +145,9 @@
    @TableField(exist = false)
    private String info;

    @ApiModelProperty(value = "作业记录状态: 0待确认 1待签到 2等待叫号 3入园等待 4已叫号 5作业中 6作业完成 7转移中 8异常挂起 9已授权离园 10已离园 11 已过号  12取消（WMS）")
    @TableField(exist = false)
    private Integer jobStatus;

    @ApiModelProperty(value = "审批信息数据")
    @TableField(exist = false)

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java

@@ -292,6 +292,10 @@
    @TableField(exist = false)
    private Integer countum ;

    @ApiModelProperty(value = "入园原因主键")
    @TableField(exist = false)
    private Integer reasonId ;


    @ApiModelProperty(value = "WMS任务时间")
    @TableField(exist = false)

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

@@ -37,6 +37,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.business.third.EmayService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -204,10 +205,13 @@
    @Override
    public PageData<PlatformBooks> findPage(PageWrap<PlatformBooks> pageWrap) {
        IPage<PlatformBooks> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<PlatformBooks> queryWrapper = new QueryWrapper<>();
        MPJLambdaWrapper<PlatformBooks> queryWrapper = new MPJLambdaWrapper<>();
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.lambda()
        queryWrapper
                .selectAll(PlatformBooks.class)
                .selectAs(PlatformJob::getStatus,PlatformBooks::getJobStatus)
                .leftJoin(PlatformJob.class,PlatformJob::getId,PlatformBooks::getJobId)
                .eq(pageWrap.getModel().getId() != null, PlatformBooks::getId, pageWrap.getModel().getId())
                .eq(pageWrap.getModel().getCreator() != null, PlatformBooks::getCreator, pageWrap.getModel().getCreator())
                .ge(pageWrap.getModel().getCreateDate() != null, PlatformBooks::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
@@ -233,9 +237,10 @@
                .ge(pageWrap.getModel().getQueryDate() != null, PlatformBooks::getCreateDate, pageWrap.getModel().getQueryDate())
                .ge(pageWrap.getModel().getArriveDateStart() != null, PlatformBooks::getArriveDate, Utils.Date.getStart(pageWrap.getModel().getArriveDateStart()))
                .le(pageWrap.getModel().getArriveDateEnd() != null, PlatformBooks::getArriveDate, Utils.Date.getEnd(pageWrap.getModel().getArriveDateEnd()))
                .eq(pageWrap.getModel().getReasonId() != null, PlatformBooks::getReasonId, pageWrap.getModel().getReasonId())
                .orderByDesc(PlatformBooks::getCreateDate)
        ;
        PageData<PlatformBooks> pageData = PageData.from(platformBooksMapper.selectPage(page, queryWrapper));
        PageData<PlatformBooks> pageData = PageData.from(platformBooksMapper.selectJoinPage(page,PlatformBooks.class, queryWrapper));
        for (PlatformBooks platformBooks:pageData.getRecords()) {
            if(Constants.equalsInteger(platformBooks.getStatus(),Constants.ONE)||Constants.equalsInteger(platformBooks.getStatus(),Constants.ZERO)){
                String auditName = approveService.getApproveUserName(platformBooks.getId(),Constants.approveObjectType.reason);

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

@@ -264,6 +264,7 @@
                .eq(pageWrap.getModel().getCode() != null, PlatformJob::getCode, pageWrap.getModel().getCode())
                .eq(pageWrap.getModel().getBillCode() != null, PlatformJob::getBillCode, pageWrap.getModel().getBillCode())
                .eq(pageWrap.getModel().getDriverId() != null, PlatformJob::getDriverId, pageWrap.getModel().getDriverId())
                .eq(pageWrap.getModel().getReasonId() != null, PlatformBooks::getReasonId, pageWrap.getModel().getReasonId())
                .eq(pageWrap.getModel().getDriverName() != null, PlatformJob::getDriverName, pageWrap.getModel().getDriverName())
                .eq(pageWrap.getModel().getPlateNum() != null, PlatformJob::getPlateNum, pageWrap.getModel().getPlateNum())
                .eq(pageWrap.getModel().getDrivierPhone() != null, PlatformJob::getDrivierPhone, pageWrap.getModel().getDrivierPhone())
@@ -735,7 +736,7 @@
                Set<Integer> setList = new HashSet<>(platformGroupId);
                for (Integer groupId:setList) {
                    PlatformGroup platformGroup = platformGroupMapper.selectById(groupId);
                    if(Objects.nonNull(platformGroup)){
                    if(Objects.nonNull(platformGroup)&&StringUtils.isNotBlank(platformGroup.getUnFinishNoticeUsers())){
                        List<SystemUser> systemUserList = systemUserMapper.selectList(new QueryWrapper<SystemUser>().lambda()
                                .eq(SystemUser::getDeleted,Constants.ZERO).eq(SystemUser::getStatus,Constants.ZERO).isNotNull(SystemUser::getOpenid)
                                .in(SystemUser::getMemberId,Arrays.asList(platformGroup.getUnFinishNoticeUsers().split(",")))

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

@@ -1617,7 +1617,7 @@
            }
            if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.pass)
                    && Constants.equalsInteger(visits.getHkStatus(),Constants.ONE)
                    &&StringUtils.isNotBlank(visits.getHkId())){
                    &&StringUtils.isNotBlank(visits.getCarNos())){
                //取消停车场预约
                List<VisitPark> visitParkList = visitParkMapper.selectList(new QueryWrapper<VisitPark>().lambda()
                        .eq(VisitPark::getCarCode,visits.getCarNos())
@@ -2037,7 +2037,8 @@
                .eq(Visits::getId,s.getId()));

        VisitsServiceImpl.dealCancelNoticesData(noticesJoinMapper,approveMapper,"系统取消",s.getId(),
                s.getType(),Constants.equalsInteger(s.getType(),Constants.ZERO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting
                s.getType(),
                !Constants.equalsInteger(s.getType(),Constants.TWO)?Constants.noticesObjectType.visit:Constants.noticesObjectType.visitReporting
        );



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

@@ -932,7 +932,7 @@
     */
    @Override
    public   AlarmDataVO alarmDataSumByCate(){
        AlarmDataVO alarmDataVO = getAlertDataByStartEndTime(DateUtil.getPlusTime2(DateUtil.addDaysToDate(new Date(),-1))
        AlarmDataVO alarmDataVO = getAlertDataByStartEndTime(DateUtil.getPlusTime2(Utils.Date.getStart(new Date()))
                ,(DateUtil.getPlusTime2(new Date())));
        return  alarmDataVO;
    }