Browse Source

任务增加两个属性。

master
刘忱 2 years ago
parent
commit
0d0d2fefe2
  1. 1
      win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/web/core/filter/MyI18nInterceptor.java
  2. 19
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainBaseVO.java
  3. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainBaseVO.java
  4. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainBaseVO.java
  5. 20
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainBaseVO.java
  6. 20
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainBaseVO.java
  7. 9
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countJob/CountJobMainDO.java
  8. 9
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectJob/InspectJobMainDO.java
  9. 9
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptJob/PurchasereceiptJobMainDO.java
  10. 9
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnJob/PurchasereturnJobMainDO.java
  11. 23
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayJob/PutawayJobMainDO.java
  12. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java
  13. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java
  14. 61
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java
  15. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java

1
win-framework/win-spring-boot-starter-web/src/main/java/com/win/framework/web/core/filter/MyI18nInterceptor.java

@ -17,7 +17,6 @@ public class MyI18nInterceptor implements HandlerInterceptor {
final String key = "language"; final String key = "language";
String language = request.getHeader(key); String language = request.getHeader(key);
// 前端传递的language必须是zh-CN格式的,中间的-必须要完整,不能只传递zh或en // 前端传递的language必须是zh-CN格式的,中间的-必须要完整,不能只传递zh或en
log.debug("当前语言={}", language);
if(language == null || language.isEmpty()) { if(language == null || language.isEmpty()) {
language = "zh-CN"; language = "zh-CN";
} }

19
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainBaseVO.java

@ -1,18 +1,11 @@
package com.win.module.wms.controller.countJob.vo; package com.win.module.wms.controller.countJob.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.Data;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import javax.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
/** /**
@ -143,4 +136,10 @@ public class CountJobMainBaseVO {
@Schema(description = "允许修改箱码") @Schema(description = "允许修改箱码")
private String allowModifyPackingNumber; private String allowModifyPackingNumber;
@Schema(description = "入库库存状态范围")
private String inInventoryStatuses;
@Schema(description = "出库库存状态范围")
private String outInventoryStatuses;
} }

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainBaseVO.java

@ -17,11 +17,9 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY
@Data @Data
public class InspectJobMainBaseVO { public class InspectJobMainBaseVO {
@Schema(description = "id", example = "id") @Schema(description = "id", example = "id")
private Long id; private Long id;
@Schema(description = "申请单号", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "申请单号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "申请单号不能为空") @NotNull(message = "申请单号不能为空")
private String requestNumber; private String requestNumber;
@ -179,4 +177,10 @@ public class InspectJobMainBaseVO {
@Schema(description = "允许修改箱码") @Schema(description = "允许修改箱码")
private String allowModifyPackingNumber; private String allowModifyPackingNumber;
@Schema(description = "入库库存状态范围")
private String inInventoryStatuses;
@Schema(description = "出库库存状态范围")
private String outInventoryStatuses;
} }

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainBaseVO.java

@ -157,4 +157,10 @@ public class PurchasereceiptJobMainBaseVO {
@Schema(description = "允许修改箱码") @Schema(description = "允许修改箱码")
private String allowModifyPackingNumber; private String allowModifyPackingNumber;
@Schema(description = "入库库存状态范围")
private String inInventoryStatuses;
@Schema(description = "出库库存状态范围")
private String outInventoryStatuses;
} }

20
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainBaseVO.java

@ -1,18 +1,12 @@
package com.win.module.wms.controller.purchasereturnJob.vo; package com.win.module.wms.controller.purchasereturnJob.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.Data;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import javax.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
/** /**
@ -175,4 +169,10 @@ public class PurchasereturnJobMainBaseVO {
@Schema(description = "允许修改箱码") @Schema(description = "允许修改箱码")
private String allowModifyPackingNumber; private String allowModifyPackingNumber;
@Schema(description = "入库库存状态范围")
private String inInventoryStatuses;
@Schema(description = "出库库存状态范围")
private String outInventoryStatuses;
} }

20
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainBaseVO.java

@ -1,18 +1,12 @@
package com.win.module.wms.controller.putawayJob.vo; package com.win.module.wms.controller.putawayJob.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.Data;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import javax.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
/** /**
@ -150,4 +144,10 @@ public class PutawayJobMainBaseVO {
@Schema(description = "允许修改箱码") @Schema(description = "允许修改箱码")
private String allowModifyPackingNumber; private String allowModifyPackingNumber;
@Schema(description = "入库库存状态范围")
private String inInventoryStatuses;
@Schema(description = "出库库存状态范围")
private String outInventoryStatuses;
} }

9
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countJob/CountJobMainDO.java

@ -201,9 +201,16 @@ public class CountJobMainDO extends BaseDO {
* 允许修改箱码 * 允许修改箱码
*/ */
private String allowModifyPackingNumber; private String allowModifyPackingNumber;
/** /**
* 主表ID * 主表ID
*/ */
private Long masterId; private Long masterId;
/**
* 入库库存状态范围
*/
private String inInventoryStatuses;
/**
* 出库库存状态范围
*/
private String outInventoryStatuses;
} }

9
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectJob/InspectJobMainDO.java

@ -276,5 +276,12 @@ public class InspectJobMainDO extends BaseDO {
* 枚举 {@link TODO true_false 对应的类} * 枚举 {@link TODO true_false 对应的类}
*/ */
private String allowModifyPackingNumber; private String allowModifyPackingNumber;
/**
* 入库库存状态范围
*/
private String inInventoryStatuses;
/**
* 出库库存状态范围
*/
private String outInventoryStatuses;
} }

9
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptJob/PurchasereceiptJobMainDO.java

@ -250,5 +250,12 @@ public class PurchasereceiptJobMainDO extends BaseDO {
* 枚举 {@link TODO true_false 对应的类} * 枚举 {@link TODO true_false 对应的类}
*/ */
private String allowModifyPackingNumber; private String allowModifyPackingNumber;
/**
* 入库库存状态范围
*/
private String inInventoryStatuses;
/**
* 出库库存状态范围
*/
private String outInventoryStatuses;
} }

9
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnJob/PurchasereturnJobMainDO.java

@ -256,5 +256,12 @@ public class PurchasereturnJobMainDO extends BaseDO {
* 枚举 {@link TODO true_false 对应的类} * 枚举 {@link TODO true_false 对应的类}
*/ */
private String allowModifyPackingNumber; private String allowModifyPackingNumber;
/**
* 入库库存状态范围
*/
private String inInventoryStatuses;
/**
* 出库库存状态范围
*/
private String outInventoryStatuses;
} }

23
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayJob/PutawayJobMainDO.java

@ -1,16 +1,12 @@
package com.win.module.wms.dal.dataobject.putawayJob; package com.win.module.wms.dal.dataobject.putawayJob;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.sun.xml.bind.v2.TODO;
import com.win.framework.mybatis.core.dataobject.BaseDO;
import lombok.*; import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import com.win.framework.mybatis.core.dataobject.BaseDO;
/** /**
* 上架任务主 DO * 上架任务主 DO
@ -227,5 +223,12 @@ public class PutawayJobMainDO extends BaseDO {
* 枚举 {@link TODO true_false 对应的类} * 枚举 {@link TODO true_false 对应的类}
*/ */
private String allowModifyPackingNumber; private String allowModifyPackingNumber;
/**
* 入库库存状态范围
*/
private String inInventoryStatuses;
/**
* 出库库存状态范围
*/
private String outInventoryStatuses;
} }

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java

@ -386,7 +386,10 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
//增加业务类型 //增加业务类型
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectJob"); BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectJob");
inspectJobMainDO.setBusinessType(businesstypeDO.getCode()); inspectJobMainDO.setBusinessType(businesstypeDO.getCode());
inspectJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
inspectJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
inspectJobMainMapper.insert(inspectJobMainDO); inspectJobMainMapper.insert(inspectJobMainDO);
inspectJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
List<InspectJobDetailDO> inspectJobDetailDOList = new ArrayList<>(); List<InspectJobDetailDO> inspectJobDetailDOList = new ArrayList<>();
for(InspectRequestDetailDO inspectRequestDetailDO : detailDOList) { for(InspectRequestDetailDO inspectRequestDetailDO : detailDOList) {
InspectJobDetailDO inspectJobDetailDO = InspectJobDetailConvert.INSTANCE.convert(inspectRequestDetailDO); InspectJobDetailDO inspectJobDetailDO = InspectJobDetailConvert.INSTANCE.convert(inspectRequestDetailDO);

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java

@ -521,6 +521,8 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
//增加业务类型 //增加业务类型
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReceiptJob"); BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReceiptJob");
purchasereceiptJobMainDO.setBusinessType(businesstypeDO.getCode()); purchasereceiptJobMainDO.setBusinessType(businesstypeDO.getCode());
purchasereceiptJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
purchasereceiptJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
purchasereceiptJobMainMapper.insert(purchasereceiptJobMainDO); purchasereceiptJobMainMapper.insert(purchasereceiptJobMainDO);
List<PurchasereceiptJobDetailDO> purchasereceiptJobDetailDOList = new ArrayList<>(); List<PurchasereceiptJobDetailDO> purchasereceiptJobDetailDOList = new ArrayList<>();
for(PurchasereceiptJobDetailCreateReqVO purchasereceiptJobDetailCreateReqVO : purchasereceiptJobMainCreateReqVO.getSubList()) { for(PurchasereceiptJobDetailCreateReqVO purchasereceiptJobDetailCreateReqVO : purchasereceiptJobMainCreateReqVO.getSubList()) {

61
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java

@ -209,9 +209,9 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
} }
} }
private void ifdetailQtyBigThanQty(BigDecimal detailQty, BigDecimal qty) { private void ifDetailQtyBigThanQty(BigDecimal detailQty, BigDecimal qty) {
if (detailQty.compareTo(qty) > 0) { if (detailQty.compareTo(qty) > 0) {
throw exception(QTY_EXCEPTION, "退货数量" + qty + "不能大于收货数量" + detailQty); throw exception(QTY_EXCEPTION, "退货数量" + qty + "不能大于收货数量" + detailQty);
} }
} }
@ -233,12 +233,12 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
// 校验存在存在下级单据 // 校验存在存在下级单据
PurchasereturnRequestMainDO mainDO = validatePurchasereturnRequestMainExists(id); PurchasereturnRequestMainDO mainDO = validatePurchasereturnRequestMainExists(id);
Long count = purchasereturnJobMainMapper.selectByRequestNumber(mainDO.getNumber()); Long count = purchasereturnJobMainMapper.selectByRequestNumber(mainDO.getNumber());
if(count > 0) { if (count > 0) {
throw new ServiceException(PURCHASERETURN_REQUEST_JOB_EXISTS); throw new ServiceException(PURCHASERETURN_REQUEST_JOB_EXISTS);
} }
RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());
boolean flag = requestStatusState.close(); boolean flag = requestStatusState.close();
if(!flag) { if (!flag) {
throw new ServiceException(PURCHASERETURN_REQUEST_CANNOT_CLOSE); throw new ServiceException(PURCHASERETURN_REQUEST_CANNOT_CLOSE);
} }
mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录 mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录
@ -252,12 +252,12 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
// 校验存在存在下级单据 // 校验存在存在下级单据
PurchasereturnRequestMainDO mainDO = validatePurchasereturnRequestMainExists(id); PurchasereturnRequestMainDO mainDO = validatePurchasereturnRequestMainExists(id);
Long count = purchasereturnJobMainMapper.selectByRequestNumber(mainDO.getNumber()); Long count = purchasereturnJobMainMapper.selectByRequestNumber(mainDO.getNumber());
if(count > 0) { if (count > 0) {
throw new ServiceException(PURCHASERETURN_REQUEST_JOB_EXISTS); throw new ServiceException(PURCHASERETURN_REQUEST_JOB_EXISTS);
} }
RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());
boolean flag = requestStatusState.reAdd(); boolean flag = requestStatusState.reAdd();
if(!flag) { if (!flag) {
throw new ServiceException(PURCHASERETURN_REQUEST_CANNOT_RE_ADD); throw new ServiceException(PURCHASERETURN_REQUEST_CANNOT_RE_ADD);
} }
mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录 mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录
@ -271,12 +271,12 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
PurchasereturnRequestMainDO mainDO = validatePurchasereturnRequestMainExists(id); PurchasereturnRequestMainDO mainDO = validatePurchasereturnRequestMainExists(id);
RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());
boolean flag = requestStatusState.submit(mainDO.getAutoAgree(), mainDO.getAutoExecute()); boolean flag = requestStatusState.submit(mainDO.getAutoAgree(), mainDO.getAutoExecute());
if(!flag) { if (!flag) {
throw new ServiceException(PURCHASERETURN_REQUEST_CANNOT_SUBMIT); throw new ServiceException(PURCHASERETURN_REQUEST_CANNOT_SUBMIT);
} }
mainDO.setStatus(requestStatusState.getState().getCode()); mainDO.setStatus(requestStatusState.getState().getCode());
//调用自动执行方法 //调用自动执行方法
if(RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { if (RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) {
this.generateJob(mainDO, purchasereturnRequestDetailMapper.selectList(mainDO.getId())); this.generateJob(mainDO, purchasereturnRequestDetailMapper.selectList(mainDO.getId()));
} }
trendsApi.createTrends(id, "purchasereturnRequest", "提交了采购收货申请", TrendsTypeEnum.UPDATE); trendsApi.createTrends(id, "purchasereturnRequest", "提交了采购收货申请", TrendsTypeEnum.UPDATE);
@ -290,12 +290,12 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
PurchasereturnRequestMainDO mainDO = validatePurchasereturnRequestMainExists(id); PurchasereturnRequestMainDO mainDO = validatePurchasereturnRequestMainExists(id);
RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());
boolean flag = requestStatusState.agree(mainDO.getAutoExecute()); boolean flag = requestStatusState.agree(mainDO.getAutoExecute());
if(!flag) { if (!flag) {
throw new ServiceException(PURCHASERETURN_REQUEST_CANNOT_AGREE); throw new ServiceException(PURCHASERETURN_REQUEST_CANNOT_AGREE);
} }
mainDO.setStatus(requestStatusState.getState().getCode()); mainDO.setStatus(requestStatusState.getState().getCode());
//调用自动执行方法 //调用自动执行方法
if(RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) { if (RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) {
this.generateJob(mainDO, purchasereturnRequestDetailMapper.selectList(mainDO.getId())); this.generateJob(mainDO, purchasereturnRequestDetailMapper.selectList(mainDO.getId()));
} }
trendsApi.createTrends(id, "purchasereturnRequest", "审批同意了采购收货申请", TrendsTypeEnum.UPDATE); trendsApi.createTrends(id, "purchasereturnRequest", "审批同意了采购收货申请", TrendsTypeEnum.UPDATE);
@ -309,7 +309,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
PurchasereturnRequestMainDO mainDO = validatePurchasereturnRequestMainExists(id); PurchasereturnRequestMainDO mainDO = validatePurchasereturnRequestMainExists(id);
RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());
boolean flag = requestStatusState.handle(); boolean flag = requestStatusState.handle();
if(!flag) { if (!flag) {
throw new ServiceException(PURCHASERETURN_REQUEST_CANNOT_HANDLE); throw new ServiceException(PURCHASERETURN_REQUEST_CANNOT_HANDLE);
} }
mainDO.setStatus(requestStatusState.getState().getCode()); mainDO.setStatus(requestStatusState.getState().getCode());
@ -326,7 +326,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
PurchasereturnRequestMainDO mainDO = validatePurchasereturnRequestMainExists(id); PurchasereturnRequestMainDO mainDO = validatePurchasereturnRequestMainExists(id);
RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus());
boolean flag = requestStatusState.refused(); boolean flag = requestStatusState.refused();
if(!flag) { if (!flag) {
throw new ServiceException(PURCHASERETURN_REQUEST_CANNOT_ABORT); throw new ServiceException(PURCHASERETURN_REQUEST_CANNOT_ABORT);
} }
mainDO.setStatus(requestStatusState.getState().getCode()); mainDO.setStatus(requestStatusState.getState().getCode());
@ -336,7 +336,8 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
/** /**
* 生成采购收货任务不要改动事务传播方式否则会有事务问题 * 生成采购收货任务不要改动事务传播方式否则会有事务问题
* @param mainDO 采购收货主 *
* @param mainDO 采购收货主
* @param detailDOList 采购收货子 * @param detailDOList 采购收货子
*/ */
private void generateJob(PurchasereturnRequestMainDO mainDO, List<PurchasereturnRequestDetailDO> detailDOList) { private void generateJob(PurchasereturnRequestMainDO mainDO, List<PurchasereturnRequestDetailDO> detailDOList) {
@ -363,10 +364,14 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
purchasereturnJobMainDO.setCreator(null); purchasereturnJobMainDO.setCreator(null);
purchasereturnJobMainDO.setUpdateTime(null); purchasereturnJobMainDO.setUpdateTime(null);
purchasereturnJobMainDO.setUpdater(null); purchasereturnJobMainDO.setUpdater(null);
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest");
purchasereturnJobMainDO.setBusinessType(businesstypeDO.getCode());
purchasereturnJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
purchasereturnJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
purchasereturnJobMainMapper.insert(purchasereturnJobMainDO); purchasereturnJobMainMapper.insert(purchasereturnJobMainDO);
List<ExpectoutCreateReqVO> expectoutCreateReqVOList = new ArrayList<>(); List<ExpectoutCreateReqVO> expectoutCreateReqVOList = new ArrayList<>();
List<PurchasereturnJobDetailDO> purchasereturnJobDetailDOList = new ArrayList<>(); List<PurchasereturnJobDetailDO> purchasereturnJobDetailDOList = new ArrayList<>();
for(PurchasereturnRequestDetailDO purchasereturnRequestDetailDO : detailDOList) { for (PurchasereturnRequestDetailDO purchasereturnRequestDetailDO : detailDOList) {
PurchasereturnJobDetailDO purchasereturnJobDetailDO = PurchasereturnJobDetailConvert.INSTANCE.convert(purchasereturnRequestDetailDO); PurchasereturnJobDetailDO purchasereturnJobDetailDO = PurchasereturnJobDetailConvert.INSTANCE.convert(purchasereturnRequestDetailDO);
purchasereturnJobDetailDO.setToLocationCode(purchasereturnRequestDetailDO.getToLocationCode()); purchasereturnJobDetailDO.setToLocationCode(purchasereturnRequestDetailDO.getToLocationCode());
purchasereturnJobDetailDO.setNumber(number); purchasereturnJobDetailDO.setNumber(number);
@ -433,7 +438,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
//子表校验 //子表校验
for (PurchasereturnRequestDetailDO purchasereturnRequestDetailDO : subDOList) { for (PurchasereturnRequestDetailDO purchasereturnRequestDetailDO : subDOList) {
purchasereturnRequestDetailDO.setId(null); purchasereturnRequestDetailDO.setId(null);
validatorDetailMethod(purchasereturnRequestDetailDO,mainDO); validatorDetailMethod(purchasereturnRequestDetailDO, mainDO);
} }
} }
@ -446,7 +451,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
} }
//校验主表公共方法(适用于新增/修改) //校验主表公共方法(适用于新增/修改)
private PurchasereturnRequestMainDO validatorMainMethod(PurchasereturnRequestMainBaseVO baseVO){ private PurchasereturnRequestMainDO validatorMainMethod(PurchasereturnRequestMainBaseVO baseVO) {
PurchasereturnRequestMainDO mainDo = PurchasereturnRequestMainConvert.INSTANCE.convert(baseVO); PurchasereturnRequestMainDO mainDo = PurchasereturnRequestMainConvert.INSTANCE.convert(baseVO);
requestsettingAndBusinesstypeSet(mainDo); requestsettingAndBusinesstypeSet(mainDo);
return mainDo; return mainDo;
@ -465,9 +470,9 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId()); PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId());
mainDo.setPpNumber(purchasereceiptRecordMainDO.getPpNumber()); mainDo.setPpNumber(purchasereceiptRecordMainDO.getPpNumber());
mainDo.setAsnNumber(purchasereceiptRecordMainDO.getAsnNumber()); mainDo.setAsnNumber(purchasereceiptRecordMainDO.getAsnNumber());
ifdetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty()); ifDetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty());
BigDecimal bigDecimal = validatorBalance(detailDo,mainDo); BigDecimal bigDecimal = validatorBalance(detailDo, mainDo);
ifdetailQtyBigThanQty(detailDo.getQty(),bigDecimal); ifDetailQtyBigThanQty(detailDo.getQty(), bigDecimal);
} }
/** /**
@ -511,7 +516,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
* @param detailDo * @param detailDo
* @return * @return
*/ */
private String validatorPurchasereturnRequestDetailImport(PurchasereturnRequestDetailDO detailDo, PurchasereturnRequestMainDO mainDo,BusinesstypeDO businesstypeDO) { private String validatorPurchasereturnRequestDetailImport(PurchasereturnRequestDetailDO detailDo, PurchasereturnRequestMainDO mainDo, BusinesstypeDO businesstypeDO) {
StringBuilder message = new StringBuilder(); StringBuilder message = new StringBuilder();
try { try {
ItembasicDO itembasicDO = validatorItembasic(detailDo.getItemCode()); ItembasicDO itembasicDO = validatorItembasic(detailDo.getItemCode());
@ -533,20 +538,20 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
message.append(ex.getMessage()).append(","); message.append(ex.getMessage()).append(",");
} }
try { try {
validatorIfInToLocationType(detailDo.getFromLocationCode(),businesstypeDO); validatorIfInToLocationType(detailDo.getFromLocationCode(), businesstypeDO);
}catch (Exception ex) { } catch (Exception ex) {
message.append(ex.getMessage()).append(","); message.append(ex.getMessage()).append(",");
} }
try { try {
validatorLocation(detailDo.getFromLocationCode()); validatorLocation(detailDo.getFromLocationCode());
}catch (Exception ex) { } catch (Exception ex) {
message.append(ex.getMessage()).append(","); message.append(ex.getMessage()).append(",");
} }
try { try {
PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordMainService.selectPurchasereceiptExist(detailDo.getPoNumber(), mainDo.getSupplierCode(), mainDo.getPurchaseReceiptRecordNumber(), detailDo.getPoLine(), detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch()); PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO = purchasereceiptRecordMainService.selectPurchasereceiptExist(detailDo.getPoNumber(), mainDo.getSupplierCode(), mainDo.getPurchaseReceiptRecordNumber(), detailDo.getPoLine(), detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch());
PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId()); PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = purchasereceiptRecordMainMapper.selectById(purchasereceiptRecordDetailDO.getMasterId());
try { try {
ifdetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty()); ifDetailQtyBigThanQty(purchasereceiptRecordDetailDO.getQty(), detailDo.getQty());
} catch (Exception ex) { } catch (Exception ex) {
message.append(ex.getMessage()).append(","); message.append(ex.getMessage()).append(",");
} }
@ -554,10 +559,10 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
message.append(ex.getMessage()).append(","); message.append(ex.getMessage()).append(",");
} }
try { try {
BigDecimal bigDecimal = validatorBalance(detailDo,mainDo); BigDecimal bigDecimal = validatorBalance(detailDo, mainDo);
try{ try {
ifdetailQtyBigThanQty(detailDo.getQty(),bigDecimal); ifDetailQtyBigThanQty(detailDo.getQty(), bigDecimal);
}catch (Exception ex) { } catch (Exception ex) {
message.append(ex.getMessage()).append(","); message.append(ex.getMessage()).append(",");
} }
} catch (Exception ex) { } catch (Exception ex) {

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java

@ -355,6 +355,10 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
putawayJobMainDO.setAllowPartialComplete(jobsettingDO.getAllowPartialComplete()); putawayJobMainDO.setAllowPartialComplete(jobsettingDO.getAllowPartialComplete());
putawayJobMainDO.setAllowModifyPackingNumber(jobsettingDO.getAllowModifyPackingNumber()); putawayJobMainDO.setAllowModifyPackingNumber(jobsettingDO.getAllowModifyPackingNumber());
putawayJobMainDO.setAllowModifyBatch(jobsettingDO.getAllowModifyBach()); putawayJobMainDO.setAllowModifyBatch(jobsettingDO.getAllowModifyBach());
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest");
putawayJobMainDO.setBusinessType(businesstypeDO.getCode());
putawayJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
putawayJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
putawayJobMainMapper.insert(putawayJobMainDO); putawayJobMainMapper.insert(putawayJobMainDO);
List<PutawayJobDetailDO> putawayJobDetailDOList = new ArrayList<>(); List<PutawayJobDetailDO> putawayJobDetailDOList = new ArrayList<>();
for(PutawayRequestDetailDO putawayRequestDetailDO : detailDOList) { for(PutawayRequestDetailDO putawayRequestDetailDO : detailDOList) {

Loading…
Cancel
Save