最新版本

jiangping

2024-08-14 15c0000d712dac810607c314a5966998ce440922

最新版本

 admin/src/components/business/OperaCarsWindow.vue

@@ -12,10 +12,9 @@
          </el-form-item>
          <el-form-item label="车辆类型" prop="type">
            <el-radio-group v-model="form.type" >
              <el-radio :label="0"  >员工车辆</el-radio>
              <el-radio  :label="1"  >安泰公务车</el-radio>
              <el-radio  :label="2"  >安泰物流车</el-radio>
              <el-radio  :label="3"  >市公司公车</el-radio>
              <el-radio  :label="0"  >安泰公务车</el-radio>
              <el-radio  :label="1"  >安泰物流车</el-radio>
              <el-radio  :label="2"  >其他</el-radio>
            </el-radio-group>
          </el-form-item>
          <el-form-item label="选择车主：" prop="memberId">

 admin/src/views/vehicle/cars.vue

@@ -19,10 +19,9 @@
          </el-form-item>
          <el-form-item label="车辆类型" prop="type">
            <el-select v-model="searchForm.type" @keypress.enter.native="search" clearable placeholder="车辆类型">
              <el-option label="员工车辆" value="0"></el-option>
              <el-option label="安泰公务车" value="1"></el-option>
              <el-option label="安泰物流车" value="2"></el-option>
              <el-option label="市公司公车" value="3"></el-option>
             <el-option label="安泰公务车" value="0"></el-option>
              <el-option label="安泰自有物流车" value="1"></el-option>
              <el-option label="其他" value="2"></el-option>
          </el-select>
          </el-form-item>
                      <section>
@@ -46,10 +45,9 @@
                <el-table-column prop="code" label="车牌号" min-width="100px"></el-table-column>
                <el-table-column label="车辆类型" min-width="100px">
                    <template slot-scope="{row}">
                      <span v-if="row.type == 0" >员工车辆</span>
                      <span v-if="row.type == 1">安泰公务车</span>
                      <span v-if="row.type == 2" >安泰物流车</span>
                      <span v-if="row.type == 3" >市公司公车</span>
                      <span v-if="row.type == 0" >安泰公务车</span>
                      <span v-if="row.type == 1">安泰自有物流车</span>
                      <span v-if="row.type == 2" >其他</span>
                    </template>
                </el-table-column>
              <el-table-column prop="memberName" label="车主姓名"  min-width="100px"></el-table-column>

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

@@ -47,6 +47,9 @@
    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
    @ExcelColumn(name="是否删除0否 1是")
    private Integer isdeleted;
    @ApiModelProperty(value = "0未完成 1已完成 2已取消", example = "1")
    @ExcelColumn(name="状态 0未完成 1已完成 2已取消")
    private Integer status;

    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="备注")

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

@@ -92,6 +92,7 @@
                    entity.setIocode(d.getIoCode());
                    entity.setJobId(job.getId());
                    entity.setIoQty(d.getIoQty());
                    entity.setStatus(Constants.ZERO);
                    entity.setRate(d.getRate());
                    entity.setMaterialName(d.getMaterialName());
                    entity.setInRepertotyCode(d.getInRepertotyCode());
@@ -131,7 +132,8 @@
        job.setType(Constants.platformJobType.wxcxh);//默认是外协车卸货
        job.setStatus(Constants.PlatformJobStatus.WAIT_CONFIRM.getKey());//默认待确认状态
        Cars car = carsMapper.selectOne(new QueryWrapper<Cars>()
                .select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in()) as jobNum")
                .select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in("+
                        Constants.PlatformJobStatus.LEAVED+")) as jobNum")
                .lambda()
                .eq(Cars::getIsdeleted,Constants.ZERO)
                .eq(Cars::getType,Constants.ONE)
@@ -154,7 +156,8 @@
        job.setType(Constants.platformJobType.wxczh);//默认是外协车装好
        job.setStatus(Constants.PlatformJobStatus.WAIT_CONFIRM.getKey());//默认待确认状态
        Cars car = carsMapper.selectOne(new QueryWrapper<Cars>()
                .select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in()) as jobNum")
                .select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in("+
                        Constants.PlatformJobStatus.LEAVED+")) as jobNum")
                .lambda()
                .eq(Cars::getIsdeleted,Constants.ZERO)
                .eq(Cars::getType,Constants.ONE)
@@ -223,6 +226,7 @@
                    entity.setIocode(d.getIoCode());
                    entity.setJobId(job.getId());
                    entity.setIoQty(d.getIoQty());
                    entity.setStatus(Constants.ZERO);
                    entity.setRate(d.getRate());
                    entity.setMaterialName(d.getMaterialName());
                    iocodeList.add(d.getIoCode());
@@ -269,11 +273,18 @@
     */
    @Override
    public WmsBaseResponse cancelOutbound(List<WmsActionNoticeRequest> list) {
        //TODO-------------------处理出库取消通知业务--------------------
        if(list ==null || list.size() ==0){
            return returnFailReuslt("请求参数不正确，参数不能为空");
        }

        List<String> iocodeList = new ArrayList<>();
        for(WmsActionNoticeRequest param :list){
            iocodeList.add(param.getIoCode());
        }
        //取消全部数据状态为 【已取消】
         platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
                .set(PlatformWmsDetail::getStatus,Constants.TWO)
                .in(PlatformWmsDetail::getIocode,iocodeList)
                .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));
        return returnSuccessReuslt(null);
    }
    /**
@@ -283,10 +294,18 @@
     */
    @Override
    public WmsBaseResponse doneTask(List<WmsActionNoticeRequest> list) {
        //TODO-------------------处理出入库作业完成通知业务--------------------
        if(list ==null || list.size() ==0){
            return returnFailReuslt("请求参数不正确，参数不能为空");
        }
        List<String> iocodeList = new ArrayList<>();
        for(WmsActionNoticeRequest param :list){
            iocodeList.add(param.getIoCode());
        }
        //取消全部数据状态为 【已完成】
        platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
                .set(PlatformWmsDetail::getStatus,Constants.ONE)
                .in(PlatformWmsDetail::getIocode,iocodeList)
                .eq(PlatformWmsDetail::getIsdeleted, Constants.ZERO));

        return returnSuccessReuslt(null);
    }