入库出库默认类型修改
This commit is contained in:
+7
@@ -1094,6 +1094,13 @@ public class StockInOrderApplicationService {
|
|||||||
// order.setOrderTypeCode(h.getOrderTypeCode());
|
// order.setOrderTypeCode(h.getOrderTypeCode());
|
||||||
order.setConsignmentNo(h.getConsignmentNo());
|
order.setConsignmentNo(h.getConsignmentNo());
|
||||||
order.setRemark(h.getRemark());
|
order.setRemark(h.getRemark());
|
||||||
|
// 导入入库单时,如果入库单类型为空,默认设置为普通入库
|
||||||
|
if (StringUtils.isBlank(order.getOrderTypeCode())) {
|
||||||
|
order.setOrderTypeCode("pu_tong_ru_ku");
|
||||||
|
}
|
||||||
|
if (StringUtils.isBlank(order.getOrderTypeName())) {
|
||||||
|
order.setOrderTypeName("普通入库单");
|
||||||
|
}
|
||||||
|
|
||||||
// 报关表头字段(优先使用表头字段,如果表头为空则使用明细行字段)
|
// 报关表头字段(优先使用表头字段,如果表头为空则使用明细行字段)
|
||||||
order.setTo(StringUtils.isNotBlank(headerInfo.getTo()) ? headerInfo.getTo() : h.getTo());
|
order.setTo(StringUtils.isNotBlank(headerInfo.getTo()) ? headerInfo.getTo() : h.getTo());
|
||||||
|
|||||||
+7
@@ -115,6 +115,13 @@ public class ExcelParseService {
|
|||||||
stockOutOrder.setOrganizationName(loginUser.getUserPo().getOrganizationName());
|
stockOutOrder.setOrganizationName(loginUser.getUserPo().getOrganizationName());
|
||||||
}
|
}
|
||||||
initParam(stockOutOrder);
|
initParam(stockOutOrder);
|
||||||
|
// 导入出库单时,如果出库单类型为空,默认设置为普通出库
|
||||||
|
if (StringUtils.isBlank(stockOutOrder.getOrderTypeCode())) {
|
||||||
|
stockOutOrder.setOrderTypeCode("pu_tong_chu_ku");
|
||||||
|
}
|
||||||
|
if (StringUtils.isBlank(stockOutOrder.getOrderTypeName())) {
|
||||||
|
stockOutOrder.setOrderTypeName("普通出库");
|
||||||
|
}
|
||||||
//设置创建时间和创建人信息
|
//设置创建时间和创建人信息
|
||||||
if (loginUser != null) {
|
if (loginUser != null) {
|
||||||
stockOutOrder.setCreateBy(loginUser.getUserid());
|
stockOutOrder.setCreateBy(loginUser.getUserid());
|
||||||
|
|||||||
+9
@@ -69,6 +69,15 @@ public class StockInOrderAssembler {
|
|||||||
stockInOrderDO.setCreateByName(userName);
|
stockInOrderDO.setCreateByName(userName);
|
||||||
stockInOrderDO.setCreateTime(new Date());
|
stockInOrderDO.setCreateTime(new Date());
|
||||||
stockInOrderDO.setDelFlag(1);
|
stockInOrderDO.setDelFlag(1);
|
||||||
|
// 新增入库单时,如果入库单类型为空,默认设置为普通入库
|
||||||
|
String orderTypeCode = stockInOrderDO.getOrderTypeCode();
|
||||||
|
if (orderTypeCode == null || orderTypeCode.trim().length() == 0) {
|
||||||
|
stockInOrderDO.setOrderTypeCode("pu_tong_ru_ku");
|
||||||
|
}
|
||||||
|
String orderTypeName = stockInOrderDO.getOrderTypeName();
|
||||||
|
if (orderTypeName == null || orderTypeName.trim().length() == 0) {
|
||||||
|
stockInOrderDO.setOrderTypeName("普通入库单");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return stockInOrderDO;
|
return stockInOrderDO;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user