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/service/countJob/CountJobMainServiceImpl.java

@@ -14,13 +14,11 @@ import com.win.module.wms.controller.countJob.vo.CountJobDetailUpdateReqVO;
 import com.win.module.wms.controller.countJob.vo.CountJobMainExportReqVO;
 import com.win.module.wms.controller.countJob.vo.CountJobMainPageReqVO;
 import com.win.module.wms.controller.countJob.vo.CountJobMainUpdateReqVO;
-import com.win.module.wms.convert.countJob.CountJobDetailConvert;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.countJob.CountJobMainDO;
 import com.win.module.wms.dal.dataobject.countRecord.CountRecordDetailDO;
 import com.win.module.wms.dal.dataobject.countRecord.CountRecordMainDO;
 import com.win.module.wms.dal.dataobject.countRequest.CountRequestMainDO;
-import com.win.module.wms.dal.mysql.countJob.CountJobDetailMapper;
 import com.win.module.wms.dal.mysql.countJob.CountJobMainMapper;
 import com.win.module.wms.dal.mysql.countRecord.CountRecordDetailMapper;
 import com.win.module.wms.dal.mysql.countRecord.CountRecordMainMapper;
@@ -64,6 +62,8 @@ public class CountJobMainServiceImpl implements CountJobMainService {
     private SerialNumberApi serialNumberApi;
     @Resource
     private CountRequestMainMapper countRequestMainMapper;
+    @Resource
+    private JobUtils jobUtils;
 
     @Override
     public CountJobMainDO getCountJobMain(Long id) {
@@ -167,6 +167,9 @@ public class CountJobMainServiceImpl implements CountJobMainService {
         String number = serialNumberApi.generateCode(RuleCodeEnum.COUNT_RECORD.getCode());
         countRecordMainDO.setNumber(number);
         countRecordMainDO.setJobNumber(countJobMainDO.getNumber());
+        //增加业务类型
+        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CountRecord");
+        countRecordMainDO.setBusinessType(businesstypeDO.getCode());
         countRecordMainDO.setId(null);
         countRecordMainDO.setCreator(null);
         countRecordMainDO.setCreateTime(null);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java

@@ -10,13 +10,9 @@ 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.countRecord.vo.CountRecordDetailCreateReqVO;
-import com.win.module.wms.controller.countRecord.vo.CountRecordMainCreateReqVO;
 import com.win.module.wms.controller.countRequest.vo.*;
 import com.win.module.wms.convert.countJob.CountJobDetailConvert;
 import com.win.module.wms.convert.countJob.CountJobMainConvert;
-import com.win.module.wms.convert.countRecord.CountRecordDetailConvert;
-import com.win.module.wms.convert.countRecord.CountRecordMainConvert;
 import com.win.module.wms.convert.countRequest.CountRequestDetailConvert;
 import com.win.module.wms.convert.countRequest.CountRequestMainConvert;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
@@ -47,7 +43,6 @@ import com.win.module.wms.service.requestsetting.RequestsettingService;
 import com.win.module.wms.service.shift.ShiftService;
 import com.win.module.wms.service.supplieritem.SupplieritemService;
 import com.win.module.wms.util.JobUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -342,25 +337,6 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
      * @param detailDOList 盘点申请子
      */
     private void generateJob(CountRequestMainDO mainDO, List<CountRequestDetailDO> detailDOList) {
-        //跳过任务直接生成记录
-        if("TRUE".equals(mainDO.getDirectCreateRecord())) {
-            CountRecordMainCreateReqVO countRecordMainCreateReqVO = new CountRecordMainCreateReqVO();
-            BeanUtils.copyProperties(mainDO, countRecordMainCreateReqVO);
-            countRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber());
-            String number = serialNumberApi.generateCode(RuleCodeEnum.COUNT_RECORD.getCode());
-            countRecordMainCreateReqVO.setNumber(number);
-            //增加业务类型
-            BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CountRecord");
-            countRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
-            countRecordMainMapper.insert(CountRecordMainConvert.INSTANCE.convert(countRecordMainCreateReqVO));
-            for(CountRequestDetailDO countRequestDetailDO : detailDOList) {
-                CountRecordDetailCreateReqVO countRecordDetailCreateReqVO = new CountRecordDetailCreateReqVO();
-                BeanUtils.copyProperties(countRequestDetailDO, countRecordDetailCreateReqVO);
-                countRecordDetailCreateReqVO.setNumber(number);
-                countRecordDetailMapper.insert(CountRecordDetailConvert.INSTANCE.convert(countRecordDetailCreateReqVO));
-            }
-            return;
-        }
         //按库位拆分任务
         Map<String, List<CountRequestDetailDO>> listMap = new HashMap<>();
         for(CountRequestDetailDO detailDO : detailDOList) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java

@@ -191,7 +191,7 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain
         String number = serialNumberApi.generateCode(RuleCodeEnum.COUNT_ADJUST_RECORD.getCode());
         countadjustRecordMainCreateReqVO.setNumber(number);
         //增加业务类型
-        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CountadjustRecord");
+        BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CountAdjustRecord");
         countadjustRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
         CountadjustRecordMainDO countadjustRecordMainDO = CountadjustRecordMainConvert.INSTANCE.convert(countadjustRecordMainCreateReqVO);
         countadjustRecordMainMapper.insert(countadjustRecordMainDO);
@@ -206,7 +206,7 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain
             TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO();
             BeanUtils.copyProperties(countadjustRecordDetailCreateReqVO, transactionCreateReqVO);
             //增加业务类型
-            BusinesstypeDO countAdjustBusinesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CountAdjust");
+            BusinesstypeDO countAdjustBusinesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CountAdjustRecord");
             transactionCreateReqVO.setBusinessType(countAdjustBusinesstypeDO.getCode());
             if(countadjustRecordDetailCreateReqVO.getAdjustQty().compareTo(BigDecimal.ZERO) > 0) {
                 TransactiontypeDO transactionTypeDOIn = jobUtils.selectDocumentFromTransactionType(countAdjustBusinesstypeDO.getInTransactionType());