|
@@ -314,6 +314,7 @@ public class MaterialRequisitionServiceImpl implements MaterialRequisitionServic
|
|
|
// 生成领料单编号
|
|
// 生成领料单编号
|
|
|
String requisitionCode = flowNoService.generateMaterialRequisitionCode(requisition, connection);
|
|
String requisitionCode = flowNoService.generateMaterialRequisitionCode(requisition, connection);
|
|
|
requisition.setCode(requisitionCode);
|
|
requisition.setCode(requisitionCode);
|
|
|
|
|
+ requisition.setName(requisitionCode);
|
|
|
|
|
|
|
|
jdbcClient.jdbcInsert(requisition, connection);
|
|
jdbcClient.jdbcInsert(requisition, connection);
|
|
|
|
|
|
|
@@ -333,6 +334,7 @@ public class MaterialRequisitionServiceImpl implements MaterialRequisitionServic
|
|
|
|
|
|
|
|
// 查询物料信息获取单位
|
|
// 查询物料信息获取单位
|
|
|
String unit = null;
|
|
String unit = null;
|
|
|
|
|
+ String specification = null;
|
|
|
if (subBom.getMaterialCode() != null) {
|
|
if (subBom.getMaterialCode() != null) {
|
|
|
ProductMaterial materialQuery = new ProductMaterial();
|
|
ProductMaterial materialQuery = new ProductMaterial();
|
|
|
materialQuery.setCode(subBom.getMaterialCode());
|
|
materialQuery.setCode(subBom.getMaterialCode());
|
|
@@ -340,11 +342,12 @@ public class MaterialRequisitionServiceImpl implements MaterialRequisitionServic
|
|
|
List<ProductMaterial> materials = jdbcClient.getJdbcList(materialQuery, connection);
|
|
List<ProductMaterial> materials = jdbcClient.getJdbcList(materialQuery, connection);
|
|
|
if (materials != null && !materials.isEmpty()) {
|
|
if (materials != null && !materials.isEmpty()) {
|
|
|
unit = materials.get(0).getUnit();
|
|
unit = materials.get(0).getUnit();
|
|
|
|
|
+ specification = materials.get(0).getSpecification();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
item.setUnit(unit);
|
|
item.setUnit(unit);
|
|
|
|
|
+ item.setSpecification(specification);
|
|
|
|
|
|
|
|
- item.setTenantId(dispatch.getTenantId());
|
|
|
|
|
item.setCreateTime(FORMATTER.format(LocalDateTime.now()));
|
|
item.setCreateTime(FORMATTER.format(LocalDateTime.now()));
|
|
|
|
|
|
|
|
jdbcClient.jdbcInsert(item, connection);
|
|
jdbcClient.jdbcInsert(item, connection);
|
|
@@ -454,7 +457,6 @@ public class MaterialRequisitionServiceImpl implements MaterialRequisitionServic
|
|
|
for (MaterialRequisitionItem item : items) {
|
|
for (MaterialRequisitionItem item : items) {
|
|
|
item.setId(null);
|
|
item.setId(null);
|
|
|
item.setRequisitionId(requisitionId);
|
|
item.setRequisitionId(requisitionId);
|
|
|
- item.setTenantId(tenantId);
|
|
|
|
|
if (item.getActualQuantity() == null) {
|
|
if (item.getActualQuantity() == null) {
|
|
|
item.setActualQuantity(BigDecimal.ZERO);
|
|
item.setActualQuantity(BigDecimal.ZERO);
|
|
|
}
|
|
}
|