Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java

@@ -7,6 +7,7 @@ import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainUpdateReqVO;
 import com.win.module.wms.controller.unplannedissueJob.vo.*;
 import com.win.module.wms.convert.unplannedissueJob.UnplannedissueJobDetailConvert;
 import com.win.module.wms.convert.unplannedissueJob.UnplannedissueJobMainConvert;
@@ -196,4 +197,12 @@ public class UnplannedissueJobMainController {
         return success(number);
     }
 
+    @PutMapping("/getExecuteJson")
+    @Operation(summary = "获取执行请求参数")
+    @Parameter(name = "id", description = "编号", required = true)
+    public CommonResult<UnplannedissueJobMainUpdateReqVO> getExecuteJson(@RequestParam("id") Long id) {
+        UnplannedissueJobMainUpdateReqVO updateReqVO = unplannedissueJobMainService.getExecuteJson(id);
+        return success(updateReqVO);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobDetailService.java

@@ -1,15 +1,16 @@
 package com.win.module.wms.service.transferissueJob;
 
-import java.util.*;
-import javax.validation.*;
-
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailCreateReqVO;
 import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailExportReqVO;
 import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailPageReqVO;
 import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailUpdateReqVO;
 import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobDetailDO;
-import com.win.framework.common.pojo.PageResult;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 调拨出库任务子 Service 接口

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobDetailServiceImpl.java

@@ -1,24 +1,23 @@
 package com.win.module.wms.service.transferissueJob;
 
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailCreateReqVO;
 import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailExportReqVO;
 import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailPageReqVO;
 import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailUpdateReqVO;
+import com.win.module.wms.convert.transferissueJob.TransferissueJobDetailConvert;
+import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobDetailDO;
+import com.win.module.wms.dal.mysql.transferissueJob.TransferissueJobDetailMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
-
-import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobDetailDO;
-import com.win.framework.common.pojo.PageResult;
-
-import com.win.module.wms.convert.transferissueJob.TransferissueJobDetailConvert;
-import com.win.module.wms.dal.mysql.transferissueJob.TransferissueJobDetailMapper;
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.win.module.wms.enums.ErrorCodeConstants.*;
+import static com.win.module.wms.enums.ErrorCodeConstants.TRANSFERISSUE_JOB_DETAIL_NOT_EXISTS;
 
 /**
  * 调拨出库任务子 Service 实现类

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordDetailService.java

@@ -1,15 +1,16 @@
 package com.win.module.wms.service.transferissueRecord;
 
-import java.util.*;
-import javax.validation.*;
-
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailCreateReqVO;
 import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailExportReqVO;
 import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailPageReqVO;
 import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailUpdateReqVO;
 import com.win.module.wms.dal.dataobject.transferissueRecord.TransferissueRecordDetailDO;
-import com.win.framework.common.pojo.PageResult;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 调拨出库记录子 Service 接口

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordDetailServiceImpl.java

@@ -1,24 +1,23 @@
 package com.win.module.wms.service.transferissueRecord;
 
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailCreateReqVO;
 import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailExportReqVO;
 import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailPageReqVO;
 import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailUpdateReqVO;
+import com.win.module.wms.convert.transferissueRecord.TransferissueRecordDetailConvert;
+import com.win.module.wms.dal.dataobject.transferissueRecord.TransferissueRecordDetailDO;
+import com.win.module.wms.dal.mysql.transferissueRecord.TransferissueRecordDetailMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
-
-import com.win.module.wms.dal.dataobject.transferissueRecord.TransferissueRecordDetailDO;
-import com.win.framework.common.pojo.PageResult;
-
-import com.win.module.wms.convert.transferissueRecord.TransferissueRecordDetailConvert;
-import com.win.module.wms.dal.mysql.transferissueRecord.TransferissueRecordDetailMapper;
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.win.module.wms.enums.ErrorCodeConstants.*;
+import static com.win.module.wms.enums.ErrorCodeConstants.TRANSFERISSUE_RECORD_DETAIL_NOT_EXISTS;
 
 /**
  * 调拨出库记录子 Service 实现类

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainService.java

@@ -1,15 +1,16 @@
 package com.win.module.wms.service.transferissueRecord;
 
-import java.util.*;
-import javax.validation.*;
-
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainCreateReqVO;
 import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainExportReqVO;
 import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainPageReqVO;
 import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainUpdateReqVO;
 import com.win.module.wms.dal.dataobject.transferissueRecord.TransferissueRecordMainDO;
-import com.win.framework.common.pojo.PageResult;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 调拨出库记录主 Service 接口

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java

@@ -1,24 +1,23 @@
 package com.win.module.wms.service.transferissueRecord;
 
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainCreateReqVO;
 import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainExportReqVO;
 import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainPageReqVO;
 import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainUpdateReqVO;
+import com.win.module.wms.convert.transferissueRecord.TransferissueRecordMainConvert;
+import com.win.module.wms.dal.dataobject.transferissueRecord.TransferissueRecordMainDO;
+import com.win.module.wms.dal.mysql.transferissueRecord.TransferissueRecordMainMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
-
-import com.win.module.wms.dal.dataobject.transferissueRecord.TransferissueRecordMainDO;
-import com.win.framework.common.pojo.PageResult;
-
-import com.win.module.wms.convert.transferissueRecord.TransferissueRecordMainConvert;
-import com.win.module.wms.dal.mysql.transferissueRecord.TransferissueRecordMainMapper;
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.win.module.wms.enums.ErrorCodeConstants.*;
+import static com.win.module.wms.enums.ErrorCodeConstants.TRANSFERISSUE_RECORD_MAIN_NOT_EXISTS;
 
 /**
  * 调拨出库记录主 Service 实现类

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailService.java

@@ -1,15 +1,16 @@
 package com.win.module.wms.service.transferissueRequest;
 
-import java.util.*;
-import javax.validation.*;
-
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailCreateReqVO;
 import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailExportReqVO;
 import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailPageReqVO;
 import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailUpdateReqVO;
 import com.win.module.wms.dal.dataobject.transferissueRequest.TransferissueRequestDetailDO;
-import com.win.framework.common.pojo.PageResult;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 调拨出库申请子 Service 接口

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailServiceImpl.java

@@ -1,43 +1,38 @@
 package com.win.module.wms.service.transferissueRequest;
 
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.infra.api.trends.TrendsApi;
 import com.win.module.infra.enums.TrendsTypeEnum;
 import com.win.module.system.api.serialnumber.SerialNumberApi;
 import com.win.module.system.enums.serialNumber.RuleCodeEnum;
-import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainCreateReqVO;
 import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailCreateReqVO;
 import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailExportReqVO;
 import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailPageReqVO;
 import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailUpdateReqVO;
+import com.win.module.wms.convert.transferissueRequest.TransferissueRequestDetailConvert;
 import com.win.module.wms.dal.dataobject.balance.BalanceDO;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.location.LocationDO;
-import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestDetailDO;
-import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestMainDO;
 import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
-import com.win.module.wms.dal.dataobject.transferissueRequest.TransferissueRequestMainDO;
-import com.win.module.wms.enums.request.RequestStatusEnum;
+import com.win.module.wms.dal.dataobject.transferissueRequest.TransferissueRequestDetailDO;
+import com.win.module.wms.dal.mysql.transferissueRequest.TransferissueRequestDetailMapper;
 import com.win.module.wms.service.itembasic.ItembasicService;
 import com.win.module.wms.service.location.LocationService;
 import com.win.module.wms.service.requestsetting.RequestsettingService;
 import com.win.module.wms.util.JobUtils;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.*;
-
-import com.win.module.wms.dal.dataobject.transferissueRequest.TransferissueRequestDetailDO;
-import com.win.framework.common.pojo.PageResult;
-
-import com.win.module.wms.convert.transferissueRequest.TransferissueRequestDetailConvert;
-import com.win.module.wms.dal.mysql.transferissueRequest.TransferissueRequestDetailMapper;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.win.module.wms.enums.ErrorCodeConstants.*;
+import static com.win.module.wms.enums.ErrorCodeConstants.TRANSFERISSUE_REQUEST_DETAIL_NOT_EXISTS;
 
 /**
  * 调拨出库申请子 Service 实现类

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobDetailService.java

@@ -1,16 +1,16 @@
 package com.win.module.wms.service.transferreceiptJob;
 
-import java.util.*;
-import javax.validation.*;
-
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailCreateReqVO;
 import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailExportReqVO;
 import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailPageReqVO;
 import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailUpdateReqVO;
-import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobDetailDO;
 import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobDetailDO;
-import com.win.framework.common.pojo.PageResult;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 调拨入库任务子 Service 接口

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobDetailServiceImpl.java

@@ -1,25 +1,23 @@
 package com.win.module.wms.service.transferreceiptJob;
 
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailCreateReqVO;
 import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailExportReqVO;
 import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailPageReqVO;
 import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailUpdateReqVO;
-import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobDetailDO;
+import com.win.module.wms.convert.transferreceiptJob.TransferreceiptJobDetailConvert;
+import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobDetailDO;
+import com.win.module.wms.dal.mysql.transferreceiptJob.TransferreceiptJobDetailMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
-
-import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobDetailDO;
-import com.win.framework.common.pojo.PageResult;
-
-import com.win.module.wms.convert.transferreceiptJob.TransferreceiptJobDetailConvert;
-import com.win.module.wms.dal.mysql.transferreceiptJob.TransferreceiptJobDetailMapper;
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.win.module.wms.enums.ErrorCodeConstants.*;
+import static com.win.module.wms.enums.ErrorCodeConstants.TRANSFERRECEIPT_JOB_DETAIL_NOT_EXISTS;
 
 /**
  * 调拨入库任务子 Service 实现类

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java

@@ -3,6 +3,7 @@ package com.win.module.wms.service.transferreceiptJob;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.win.framework.common.exception.ServiceException;
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.infra.api.trends.TrendsApi;
 import com.win.module.infra.enums.TrendsTypeEnum;
 import com.win.module.system.api.serialnumber.SerialNumberApi;
@@ -10,19 +11,16 @@ import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.system.enums.serialNumber.RuleCodeEnum;
 import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO;
-import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailUpdateReqVO;
-import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainUpdateReqVO;
 import com.win.module.wms.controller.transferreceiptJob.vo.*;
+import com.win.module.wms.convert.transferreceiptJob.TransferreceiptJobMainConvert;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.location.LocationDO;
 import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO;
-import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobDetailDO;
-import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobMainDO;
-import com.win.module.wms.dal.dataobject.transferissueRecord.TransferissueRecordDetailDO;
-import com.win.module.wms.dal.dataobject.transferissueRecord.TransferissueRecordMainDO;
 import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobDetailDO;
+import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobMainDO;
 import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordDetailDO;
 import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordMainDO;
+import com.win.module.wms.dal.mysql.transferreceiptJob.TransferreceiptJobMainMapper;
 import com.win.module.wms.dal.mysql.transferreceiptRecord.TransferreceiptRecordDetailMapper;
 import com.win.module.wms.dal.mysql.transferreceiptRecord.TransferreceiptRecordMainMapper;
 import com.win.module.wms.enums.job.JobStatusState;
@@ -33,24 +31,18 @@ import com.win.module.wms.service.transaction.TransactionService;
 import com.win.module.wms.util.JobUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;
 
-import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobMainDO;
-import com.win.framework.common.pojo.PageResult;
-
-import com.win.module.wms.convert.transferreceiptJob.TransferreceiptJobMainConvert;
-import com.win.module.wms.dal.mysql.transferreceiptJob.TransferreceiptJobMainMapper;
-
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-import static com.win.module.wms.enums.ErrorCodeConstants.*;
+import static com.win.module.wms.enums.ErrorCodeConstants.TRANSFERRECEIPT_JOB_MAIN_NOT_EXISTS;
+import static com.win.module.wms.enums.ErrorCodeConstants.TRANSFERRECEIPT_JOB_MAIN_STATUS_ERROR;
 
 /**
  * 调拨入库任务主 Service 实现类

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordDetailService.java

@@ -1,15 +1,16 @@
 package com.win.module.wms.service.transferreceiptRecord;
 
-import java.util.*;
-import javax.validation.*;
-
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailCreateReqVO;
 import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailExportReqVO;
 import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailPageReqVO;
 import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailUpdateReqVO;
 import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordDetailDO;
-import com.win.framework.common.pojo.PageResult;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 调拨入库记录子 Service 接口

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordDetailServiceImpl.java

@@ -1,24 +1,23 @@
 package com.win.module.wms.service.transferreceiptRecord;
 
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailCreateReqVO;
 import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailExportReqVO;
 import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailPageReqVO;
 import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailUpdateReqVO;
+import com.win.module.wms.convert.transferreceiptRecord.TransferreceiptRecordDetailConvert;
+import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordDetailDO;
+import com.win.module.wms.dal.mysql.transferreceiptRecord.TransferreceiptRecordDetailMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
-
-import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordDetailDO;
-import com.win.framework.common.pojo.PageResult;
-
-import com.win.module.wms.convert.transferreceiptRecord.TransferreceiptRecordDetailConvert;
-import com.win.module.wms.dal.mysql.transferreceiptRecord.TransferreceiptRecordDetailMapper;
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.win.module.wms.enums.ErrorCodeConstants.*;
+import static com.win.module.wms.enums.ErrorCodeConstants.TRANSFERRECEIPT_RECORD_DETAIL_NOT_EXISTS;
 
 /**
  * 调拨入库记录子 Service 实现类

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainService.java

@@ -1,15 +1,16 @@
 package com.win.module.wms.service.transferreceiptRecord;
 
-import java.util.*;
-import javax.validation.*;
-
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainCreateReqVO;
 import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainExportReqVO;
 import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainPageReqVO;
 import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainUpdateReqVO;
 import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordMainDO;
-import com.win.framework.common.pojo.PageResult;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 调拨入库记录主 Service 接口

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java

@@ -1,24 +1,23 @@
 package com.win.module.wms.service.transferreceiptRecord;
 
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainCreateReqVO;
 import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainExportReqVO;
 import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainPageReqVO;
 import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainUpdateReqVO;
+import com.win.module.wms.convert.transferreceiptRecord.TransferreceiptRecordMainConvert;
+import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordMainDO;
+import com.win.module.wms.dal.mysql.transferreceiptRecord.TransferreceiptRecordMainMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
-
-import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordMainDO;
-import com.win.framework.common.pojo.PageResult;
-
-import com.win.module.wms.convert.transferreceiptRecord.TransferreceiptRecordMainConvert;
-import com.win.module.wms.dal.mysql.transferreceiptRecord.TransferreceiptRecordMainMapper;
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.win.module.wms.enums.ErrorCodeConstants.*;
+import static com.win.module.wms.enums.ErrorCodeConstants.TRANSFERRECEIPT_RECORD_MAIN_NOT_EXISTS;
 
 /**
  * 调拨入库记录主 Service 实现类

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainService.java

@@ -1,15 +1,16 @@
 package com.win.module.wms.service.transferreceiptRequest;
 
-import java.util.*;
-import javax.validation.*;
-
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestMainCreateReqVO;
 import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestMainExportReqVO;
 import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestMainPageReqVO;
 import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestMainUpdateReqVO;
 import com.win.module.wms.dal.dataobject.transferreceiptRequest.TransferreceiptRequestMainDO;
-import com.win.framework.common.pojo.PageResult;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 调拨入库申请主 Service 接口
@@ -25,6 +26,7 @@ public interface TransferreceiptRequestMainService {
      * @return 编号
      */
     Long createTransferreceiptRequestMain(@Valid TransferreceiptRequestMainCreateReqVO createReqVO);
+
     /**
      * 获得用高级搜索户分页列表
      *

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java

@@ -2,6 +2,7 @@ package com.win.module.wms.service.transferreceiptRequest;
 
 import com.win.framework.common.exception.ServiceException;
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.infra.api.trends.TrendsApi;
 import com.win.module.infra.enums.TrendsTypeEnum;
 import com.win.module.system.api.serialnumber.SerialNumberApi;
@@ -9,47 +10,33 @@ import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.system.enums.serialNumber.RuleCodeEnum;
 import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO;
-import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailCreateReqVO;
-import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainCreateReqVO;
-import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailCreateReqVO;
-import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailUpdateReqVO;
-import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestMainBaseVO;
-import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestMainUpdateReqVO;
 import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailCreateReqVO;
 import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainCreateReqVO;
 import com.win.module.wms.controller.transferreceiptRequest.vo.*;
-import com.win.module.wms.convert.transferissueJob.TransferissueJobDetailConvert;
-import com.win.module.wms.convert.transferissueJob.TransferissueJobMainConvert;
-import com.win.module.wms.convert.transferissueRecord.TransferissueRecordDetailConvert;
-import com.win.module.wms.convert.transferissueRecord.TransferissueRecordMainConvert;
-import com.win.module.wms.convert.transferissueRequest.TransferissueRequestDetailConvert;
-import com.win.module.wms.convert.transferissueRequest.TransferissueRequestMainConvert;
 import com.win.module.wms.convert.transferreceiptJob.TransferreceiptJobDetailConvert;
 import com.win.module.wms.convert.transferreceiptJob.TransferreceiptJobMainConvert;
 import com.win.module.wms.convert.transferreceiptRecord.TransferreceiptRecordDetailConvert;
 import com.win.module.wms.convert.transferreceiptRecord.TransferreceiptRecordMainConvert;
 import com.win.module.wms.convert.transferreceiptRequest.TransferreceiptRequestDetailConvert;
+import com.win.module.wms.convert.transferreceiptRequest.TransferreceiptRequestMainConvert;
 import com.win.module.wms.dal.dataobject.balance.BalanceDO;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.jobsetting.JobsettingDO;
 import com.win.module.wms.dal.dataobject.location.LocationDO;
 import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
-import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobDetailDO;
-import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobMainDO;
-import com.win.module.wms.dal.dataobject.transferissueRecord.TransferissueRecordMainDO;
-import com.win.module.wms.dal.dataobject.transferissueRequest.TransferissueRequestDetailDO;
-import com.win.module.wms.dal.dataobject.transferissueRequest.TransferissueRequestMainDO;
 import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobDetailDO;
 import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobMainDO;
 import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordDetailDO;
 import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordMainDO;
 import com.win.module.wms.dal.dataobject.transferreceiptRequest.TransferreceiptRequestDetailDO;
+import com.win.module.wms.dal.dataobject.transferreceiptRequest.TransferreceiptRequestMainDO;
 import com.win.module.wms.dal.mysql.transferreceiptJob.TransferreceiptJobDetailMapper;
 import com.win.module.wms.dal.mysql.transferreceiptJob.TransferreceiptJobMainMapper;
 import com.win.module.wms.dal.mysql.transferreceiptRecord.TransferreceiptRecordDetailMapper;
 import com.win.module.wms.dal.mysql.transferreceiptRecord.TransferreceiptRecordMainMapper;
 import com.win.module.wms.dal.mysql.transferreceiptRequest.TransferreceiptRequestDetailMapper;
+import com.win.module.wms.dal.mysql.transferreceiptRequest.TransferreceiptRequestMainMapper;
 import com.win.module.wms.enums.job.JobStatusEnum;
 import com.win.module.wms.enums.request.RequestStatusEnum;
 import com.win.module.wms.enums.request.RequestStatusState;
@@ -62,17 +49,15 @@ import com.win.module.wms.service.requestsetting.RequestsettingService;
 import com.win.module.wms.util.JobUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.*;
-import com.win.module.wms.dal.dataobject.transferreceiptRequest.TransferreceiptRequestMainDO;
-import com.win.framework.common.pojo.PageResult;
-import com.win.module.wms.convert.transferreceiptRequest.TransferreceiptRequestMainConvert;
-import com.win.module.wms.dal.mysql.transferreceiptRequest.TransferreceiptRequestMainMapper;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static com.win.module.wms.enums.ErrorCodeConstants.*;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobDetailService.java

@@ -1,16 +1,16 @@
 package com.win.module.wms.service.unplannedissueJob;
 
-import java.util.*;
-import javax.validation.*;
-
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailCreateReqVO;
 import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailExportReqVO;
 import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailPageReqVO;
 import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailUpdateReqVO;
-import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobDetailDO;
 import com.win.module.wms.dal.dataobject.unplannedissueJob.UnplannedissueJobDetailDO;
-import com.win.framework.common.pojo.PageResult;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 计划外出库任务子 Service 接口

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobDetailServiceImpl.java

@@ -1,25 +1,23 @@
 package com.win.module.wms.service.unplannedissueJob;
 
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailCreateReqVO;
 import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailExportReqVO;
 import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailPageReqVO;
 import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailUpdateReqVO;
-import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobDetailDO;
+import com.win.module.wms.convert.unplannedissueJob.UnplannedissueJobDetailConvert;
+import com.win.module.wms.dal.dataobject.unplannedissueJob.UnplannedissueJobDetailDO;
+import com.win.module.wms.dal.mysql.unplannedissueJob.UnplannedissueJobDetailMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
-
-import com.win.module.wms.dal.dataobject.unplannedissueJob.UnplannedissueJobDetailDO;
-import com.win.framework.common.pojo.PageResult;
-
-import com.win.module.wms.convert.unplannedissueJob.UnplannedissueJobDetailConvert;
-import com.win.module.wms.dal.mysql.unplannedissueJob.UnplannedissueJobDetailMapper;
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.win.module.wms.enums.ErrorCodeConstants.*;
+import static com.win.module.wms.enums.ErrorCodeConstants.UNPLANNEDISSUE_JOB_DETAIL_NOT_EXISTS;
 
 /**
  * 计划外出库任务子 Service 实现类

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java

@@ -1,17 +1,19 @@
 package com.win.module.wms.service.unplannedissueJob;
 
-import java.util.*;
-import javax.validation.*;
-
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainCreateReqVO;
 import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainExportReqVO;
 import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainPageReqVO;
 import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainUpdateReqVO;
 import com.win.module.wms.dal.dataobject.unplannedissueJob.UnplannedissueJobMainDO;
-import com.win.framework.common.pojo.PageResult;
 import org.springframework.lang.Nullable;
 
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 计划外出库任务主 Service 接口
  *
@@ -122,4 +124,11 @@ public interface UnplannedissueJobMainService {
      * @return number
      */
     String executeUnplannedissueJobMain(UnplannedissueJobMainUpdateReqVO updateReqVO);
+
+    /**
+     * 获取执行请求数据
+     * @param id 计划外任务主键ID
+     * @return 执行json数据
+     */
+    UnplannedissueJobMainUpdateReqVO getExecuteJson(Long id);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java

@@ -281,7 +281,7 @@ public class UnplannedissueJobMainServiceImpl implements UnplannedissueJobMainSe
                 BeanUtils.copyProperties(unplannedissueJobDetailDO, transactionCreateReqVO);
                 //增加业务类型
                 transactionCreateReqVO.setBusinessType(businesstypeDO.getCode());
-                TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType());
+                TransactiontypeDO transactiontypeDO = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType());
                 transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction());
                 transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode());
                 transactionCreateReqVO.setBusinessType(unplannedissueRecordMainDO.getBusinessType());
@@ -307,4 +307,20 @@ public class UnplannedissueJobMainServiceImpl implements UnplannedissueJobMainSe
         trendsApi.createTrends(unplannedissueJobMainDO.getId(), "UnplannedDeliverJob", "执行计划外出库任务", TrendsTypeEnum.UPDATE);
         return number;
     }
+
+    @Override
+    public UnplannedissueJobMainUpdateReqVO getExecuteJson(Long id) {
+        UnplannedissueJobMainUpdateReqVO unplannedissueJobMainUpdateReqVO = new UnplannedissueJobMainUpdateReqVO();
+        UnplannedissueJobMainDO unplannedissueJobMainDO = this.validateUnplannedissueJobMainExists(id);
+        List<UnplannedissueJobDetailDO> subList = unplannedissueJobDetailService.selectList(unplannedissueJobMainDO.getId());
+        BeanUtils.copyProperties(unplannedissueJobMainDO,unplannedissueJobMainUpdateReqVO);
+        List<UnplannedissueJobDetailUpdateReqVO> unplannedissueJobDetailUpdateReqVOList = new ArrayList<>();
+        for(UnplannedissueJobDetailDO unplannedissueJobDetailDO:subList){
+            UnplannedissueJobDetailUpdateReqVO unplannedissueJobDetailUpdateReqVO = new UnplannedissueJobDetailUpdateReqVO();
+            BeanUtils.copyProperties(unplannedissueJobDetailDO,unplannedissueJobDetailUpdateReqVO);
+            unplannedissueJobDetailUpdateReqVOList.add(unplannedissueJobDetailUpdateReqVO);
+        }
+        unplannedissueJobMainUpdateReqVO.setSubList(unplannedissueJobDetailUpdateReqVOList);
+        return unplannedissueJobMainUpdateReqVO;
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordDetailService.java

@@ -1,15 +1,16 @@
 package com.win.module.wms.service.unplannedissueRecord;
 
-import java.util.*;
-import javax.validation.*;
-
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailCreateReqVO;
 import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailExportReqVO;
 import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailPageReqVO;
 import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailUpdateReqVO;
 import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordDetailDO;
-import com.win.framework.common.pojo.PageResult;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 计划外出库记录子 Service 接口

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordDetailServiceImpl.java

@@ -1,24 +1,23 @@
 package com.win.module.wms.service.unplannedissueRecord;
 
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailCreateReqVO;
 import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailExportReqVO;
 import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailPageReqVO;
 import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailUpdateReqVO;
+import com.win.module.wms.convert.unplannedissueRecord.UnplannedissueRecordDetailConvert;
+import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordDetailDO;
+import com.win.module.wms.dal.mysql.unplannedissueRecord.UnplannedissueRecordDetailMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
-
-import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordDetailDO;
-import com.win.framework.common.pojo.PageResult;
-
-import com.win.module.wms.convert.unplannedissueRecord.UnplannedissueRecordDetailConvert;
-import com.win.module.wms.dal.mysql.unplannedissueRecord.UnplannedissueRecordDetailMapper;
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.win.module.wms.enums.ErrorCodeConstants.*;
+import static com.win.module.wms.enums.ErrorCodeConstants.UNPLANNEDISSUE_RECORD_DETAIL_NOT_EXISTS;
 
 /**
  * 计划外出库记录子 Service 实现类

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainService.java

@@ -1,15 +1,16 @@
 package com.win.module.wms.service.unplannedissueRecord;
 
-import java.util.*;
-import javax.validation.*;
-
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainCreateReqVO;
 import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainExportReqVO;
 import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainPageReqVO;
 import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainUpdateReqVO;
 import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordMainDO;
-import com.win.framework.common.pojo.PageResult;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 计划外出库记录主 Service 接口

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java

@@ -1,24 +1,23 @@
 package com.win.module.wms.service.unplannedissueRecord;
 
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainCreateReqVO;
 import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainExportReqVO;
 import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainPageReqVO;
 import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainUpdateReqVO;
+import com.win.module.wms.convert.unplannedissueRecord.UnplannedissueRecordMainConvert;
+import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordMainDO;
+import com.win.module.wms.dal.mysql.unplannedissueRecord.UnplannedissueRecordMainMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
-
-import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordMainDO;
-import com.win.framework.common.pojo.PageResult;
-
-import com.win.module.wms.convert.unplannedissueRecord.UnplannedissueRecordMainConvert;
-import com.win.module.wms.dal.mysql.unplannedissueRecord.UnplannedissueRecordMainMapper;
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.win.module.wms.enums.ErrorCodeConstants.*;
+import static com.win.module.wms.enums.ErrorCodeConstants.UNPLANNEDISSUE_RECORD_MAIN_NOT_EXISTS;
 
 /**
  * 计划外出库记录主 Service 实现类

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailService.java

@@ -1,15 +1,16 @@
 package com.win.module.wms.service.unplannedissueRequest;
 
-import java.util.*;
-import javax.validation.*;
-
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestDetailCreateReqVO;
 import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestDetailExportReqVO;
 import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestDetailPageReqVO;
 import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestDetailUpdateReqVO;
 import com.win.module.wms.dal.dataobject.unplannedissueRequest.UnplannedissueRequestDetailDO;
-import com.win.framework.common.pojo.PageResult;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 计划外出库申请子 Service 接口

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailServiceImpl.java

@@ -1,36 +1,34 @@
 package com.win.module.wms.service.unplannedissueRequest;
 
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.infra.api.trends.TrendsApi;
 import com.win.module.infra.enums.TrendsTypeEnum;
 import com.win.module.system.api.serialnumber.SerialNumberApi;
 import com.win.module.system.enums.serialNumber.RuleCodeEnum;
 import com.win.module.wms.controller.unplannedissueRequest.vo.*;
-import com.win.module.wms.convert.unplannedissueRequest.UnplannedissueRequestMainConvert;
+import com.win.module.wms.convert.unplannedissueRequest.UnplannedissueRequestDetailConvert;
 import com.win.module.wms.dal.dataobject.balance.BalanceDO;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.location.LocationDO;
 import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
-import com.win.module.wms.dal.dataobject.unplannedissueRequest.UnplannedissueRequestMainDO;
+import com.win.module.wms.dal.dataobject.unplannedissueRequest.UnplannedissueRequestDetailDO;
+import com.win.module.wms.dal.mysql.unplannedissueRequest.UnplannedissueRequestDetailMapper;
 import com.win.module.wms.service.itembasic.ItembasicService;
 import com.win.module.wms.service.location.LocationService;
 import com.win.module.wms.service.requestsetting.RequestsettingService;
 import com.win.module.wms.util.JobUtils;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
-
-import com.win.module.wms.dal.dataobject.unplannedissueRequest.UnplannedissueRequestDetailDO;
-import com.win.framework.common.pojo.PageResult;
-
-import com.win.module.wms.convert.unplannedissueRequest.UnplannedissueRequestDetailConvert;
-import com.win.module.wms.dal.mysql.unplannedissueRequest.UnplannedissueRequestDetailMapper;
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.win.module.wms.enums.ErrorCodeConstants.*;
+import static com.win.module.wms.enums.ErrorCodeConstants.UNPLANNEDISSUE_REQUEST_DETAIL_NOT_EXISTS;
 
 /**
  * 计划外出库申请子 Service 实现类

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainService.java

@@ -1,18 +1,15 @@
 package com.win.module.wms.service.unplannedissueRequest;
 
-import java.util.*;
-import javax.validation.*;
-
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.system.api.dict.dto.DictDataRespDTO;
-import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainCreateReqVO;
-import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainImportErrorVO;
 import com.win.module.wms.controller.unplannedissueRequest.vo.*;
 import com.win.module.wms.dal.dataobject.unplannedissueRequest.UnplannedissueRequestDetailDO;
 import com.win.module.wms.dal.dataobject.unplannedissueRequest.UnplannedissueRequestMainDO;
-import com.win.framework.common.pojo.PageResult;
-import com.win.module.wms.dal.dataobject.unplannedreceiptRequest.UnplannedreceiptRequestDetailDO;
-import com.win.module.wms.dal.dataobject.unplannedreceiptRequest.UnplannedreceiptRequestMainDO;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 计划外出库申请主 Service 接口

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java

@@ -1,66 +1,45 @@
 package com.win.module.wms.service.unplannedissueRequest;
 
 import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.win.framework.common.exception.ServiceException;
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
 import com.win.module.infra.api.trends.TrendsApi;
 import com.win.module.infra.enums.TrendsTypeEnum;
 import com.win.module.system.api.dict.DictDataApi;
 import com.win.module.system.api.dict.dto.DictDataRespDTO;
 import com.win.module.system.api.serialnumber.SerialNumberApi;
 import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.system.enums.serialNumber.RuleCodeEnum;
 import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO;
-import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestDetailCreateReqVO;
-import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainCreateReqVO;
-import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainImportErrorVO;
-import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailCreateReqVO;
-import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainCreateReqVO;
-import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestDetailCreateReqVO;
-import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestMainCreateReqVO;
 import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailCreateReqVO;
 import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainCreateReqVO;
 import com.win.module.wms.controller.unplannedissueRequest.vo.*;
-import com.win.module.wms.controller.unplannedreceiptRequest.vo.*;
-import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestDetailConvert;
-import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestMainConvert;
-import com.win.module.wms.convert.transferissueJob.TransferissueJobDetailConvert;
-import com.win.module.wms.convert.transferissueJob.TransferissueJobMainConvert;
-import com.win.module.wms.convert.transferissueRecord.TransferissueRecordDetailConvert;
-import com.win.module.wms.convert.transferissueRecord.TransferissueRecordMainConvert;
 import com.win.module.wms.convert.unplannedissueJob.UnplannedissueJobDetailConvert;
 import com.win.module.wms.convert.unplannedissueJob.UnplannedissueJobMainConvert;
 import com.win.module.wms.convert.unplannedissueRecord.UnplannedissueRecordDetailConvert;
 import com.win.module.wms.convert.unplannedissueRecord.UnplannedissueRecordMainConvert;
 import com.win.module.wms.convert.unplannedissueRequest.UnplannedissueRequestDetailConvert;
-import com.win.module.wms.convert.unplannedreceiptRequest.UnplannedreceiptRequestDetailConvert;
-import com.win.module.wms.convert.unplannedreceiptRequest.UnplannedreceiptRequestMainConvert;
+import com.win.module.wms.convert.unplannedissueRequest.UnplannedissueRequestMainConvert;
 import com.win.module.wms.dal.dataobject.balance.BalanceDO;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.jobsetting.JobsettingDO;
 import com.win.module.wms.dal.dataobject.location.LocationDO;
-import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO;
-import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO;
 import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO;
-import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobDetailDO;
-import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobMainDO;
-import com.win.module.wms.dal.dataobject.transferissueRecord.TransferissueRecordMainDO;
-import com.win.module.wms.dal.dataobject.transferissueRequest.TransferissueRequestDetailDO;
-import com.win.module.wms.dal.dataobject.transferissueRequest.TransferissueRequestMainDO;
 import com.win.module.wms.dal.dataobject.unplannedissueJob.UnplannedissueJobDetailDO;
 import com.win.module.wms.dal.dataobject.unplannedissueJob.UnplannedissueJobMainDO;
 import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordDetailDO;
 import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordMainDO;
 import com.win.module.wms.dal.dataobject.unplannedissueRequest.UnplannedissueRequestDetailDO;
-import com.win.module.wms.dal.dataobject.unplannedreceiptRequest.UnplannedreceiptRequestDetailDO;
-import com.win.module.wms.dal.dataobject.unplannedreceiptRequest.UnplannedreceiptRequestMainDO;
+import com.win.module.wms.dal.dataobject.unplannedissueRequest.UnplannedissueRequestMainDO;
 import com.win.module.wms.dal.mysql.unplannedissueJob.UnplannedissueJobDetailMapper;
 import com.win.module.wms.dal.mysql.unplannedissueJob.UnplannedissueJobMainMapper;
 import com.win.module.wms.dal.mysql.unplannedissueRecord.UnplannedissueRecordDetailMapper;
 import com.win.module.wms.dal.mysql.unplannedissueRecord.UnplannedissueRecordMainMapper;
 import com.win.module.wms.dal.mysql.unplannedissueRequest.UnplannedissueRequestDetailMapper;
+import com.win.module.wms.dal.mysql.unplannedissueRequest.UnplannedissueRequestMainMapper;
 import com.win.module.wms.enums.job.JobStatusEnum;
 import com.win.module.wms.enums.request.RequestStatusEnum;
 import com.win.module.wms.enums.request.RequestStatusState;
@@ -74,19 +53,15 @@ import com.win.module.wms.util.JobUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.*;
-
-import com.win.module.wms.dal.dataobject.unplannedissueRequest.UnplannedissueRequestMainDO;
-import com.win.framework.common.pojo.PageResult;
-
-import com.win.module.wms.convert.unplannedissueRequest.UnplannedissueRequestMainConvert;
-import com.win.module.wms.dal.mysql.unplannedissueRequest.UnplannedissueRequestMainMapper;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@@ -263,6 +238,8 @@ public class UnplannedissueRequestMainServiceImpl implements UnplannedissueReque
             validateDetailMethod(unplannedissueRequestDetailDO, businesstypeDO,unplannedissueRequestMainDO);
         }
         String number = serialNumberApi.generateCode(RuleCodeEnum.UNPLANNED_DELIVER_REQUEST.getCode());
+        AdminUserRespDTO adminUserRespDTO = userApi.getUser(getLoginUserId());
+        unplannedissueRequestMainDO.setDepartmentCode(String.valueOf(adminUserRespDTO.getDeptId()));
         unplannedissueRequestMainDO.setNumber(number);
         unplannedissueRequestMainMapper.insert(unplannedissueRequestMainDO);
         for(UnplannedissueRequestDetailDO unplannedreceiptRequestDetailDO: subDOList){