Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-09-20 f547171a98907dbd9f824f145df4c902ff121683

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

@@ -221,11 +221,13 @@
                    job.setCreateDate(new Date());
                    job.setIsdeleted(Constants.ZERO);
                    job.setIsNew(Constants.ONE);
                    job.setStatus(Constants.ONE);
                    job.setCarryBillCode(param.getCarrierBillCode());
                    job.setIocode(param.getIoCode());
                    job.setCarrierName(param.getCarrierName());
                    job.setDriverName(param.getDriverName());
                    job.setPlateNumber(param.getPlateNumber());
                    job.setType(Constants.ONE);
                    job.setType(Constants.ZERO);
                    job.setIoCreatedate(param.getCreateDate());
                    job.setJobId(model.getId());
                    job.setDriverPhone(param.getDriverPhone());
@@ -291,7 +293,7 @@
        job.setDriverName(param.getDriverName());
        //处理作业的车辆、司机、月台组关联关系，卸货
        dealCarPlatformAndDriverInfo(job,0);
        platformJobMapper.insert(job);
//        platformJobMapper.insert(job);
        return job;
    }

@@ -382,6 +384,7 @@
                    job = new PlatformWmsJob();
                    job.setCreateDate(new Date());
                    job.setIsdeleted(Constants.ZERO);
                    job.setStatus(Constants.ZERO);
                    job.setIsNew(Constants.ONE);
                    job.setCarryBillCode(param.getCarrierBillCode());
                    job.setIocode(param.getIoCode());
@@ -389,7 +392,9 @@
                    job.setPlateNumber(param.getPlateNumber());
                    job.setType(Constants.ONE);
                    job.setIoCreatedate(param.getCreateDate());
                    job.setJobId(job.getId());
                    job.setJobId(model.getId());
                    job.setRepertotyAddress(param.getRepertotyAddress());
                    job.setContractNum(param.getContractNum());
                    job.setDriverPhone(param.getDriverPhone());
                    platformWmsJobMapper.insert(job);
                    jobList.add(model);