rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: rakor:63a0196216524a8af3e290ed2435fc70a8137d95
Branches Tags
rakor:develop
rakor:qms/develop
rakor:qms/zhangke
rakor:qms/yf
rakor:dev_zhangke
rakor:demo
rakor:feature/rustfs
rakor:sit
rakor:feature/bug-884
rakor:feature/bug-883
rakor:feature/bug-890
rakor:feature/bug-776
rakor:feature/bug-784
rakor:feature/bug-788
rakor:feature/bug-787
rakor:rakor
rakor:template
..
compare: rakor:9404ecc255d2e7b81b97f7d9cae0fe8c0d816d72
Branches Tags
rakor:qms/develop
rakor:qms/zhangke
rakor:qms/yf
rakor:develop
rakor:dev_zhangke
rakor:demo
rakor:feature/rustfs
rakor:sit
rakor:feature/bug-884
rakor:feature/bug-883
rakor:feature/bug-890
rakor:feature/bug-776
rakor:feature/bug-784
rakor:feature/bug-788
rakor:feature/bug-787
rakor:rakor
rakor:template

No commits in common. "63a0196216524a8af3e290ed2435fc70a8137d95" and "9404ecc255d2e7b81b97f7d9cae0fe8c0d816d72" have entirely different histories.
63a0196216 ... 9404ecc255

27 changed files with 102 additions and 202 deletions
Show Stats Expand all files Collapse all files

2
nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsExemptMaterialController.java
View File

@ -110,7 +110,7 @@ public class QmsExemptMaterialController extends BaseController {
*/ */
@PostMapping("toggleEnable") @PostMapping("toggleEnable")
public ApiResult<Void> toggleEnable(@RequestBody ToggleEnableQO request) { public ApiResult<Void> toggleEnable(@RequestBody ToggleEnableQO request) {
exemptMaterialService.toggleEnable(request.getId(), request.getEnable()); exemptMaterialService.toggleEnable(request.getId(), request.getEnableStatus());
return ApiResult.success(); return ApiResult.success();
} }

10
nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsQcMaterialController.java
View File

@ -3,7 +3,7 @@ package com.nflg.qms.admin.controller;
import com.nflg.qms.admin.service.QmsQcMaterialControllerService; import com.nflg.qms.admin.service.QmsQcMaterialControllerService;
import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.ApiResult;
import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.PageData;
import com.nflg.wms.common.pojo.dto.MaterialMainDTO; import com.nflg.wms.common.pojo.dto.BomMaterialDTO;
import com.nflg.wms.common.pojo.qo.BomMaterialListQO; import com.nflg.wms.common.pojo.qo.BomMaterialListQO;
import com.nflg.wms.common.pojo.qo.QmsQcMaterialAddQO; import com.nflg.wms.common.pojo.qo.QmsQcMaterialAddQO;
import com.nflg.wms.common.pojo.qo.QmsQcMaterialSearchQO; import com.nflg.wms.common.pojo.qo.QmsQcMaterialSearchQO;
@ -15,7 +15,11 @@ import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.io.IOException; import java.io.IOException;
@ -94,7 +98,7 @@ public class QmsQcMaterialController extends BaseController {
* 搜索主物料系统物料信息 * 搜索主物料系统物料信息
*/ */
@PostMapping("searchBomMaterial") @PostMapping("searchBomMaterial")
public ApiResult<PageData<MaterialMainDTO>> searchBomMaterial(@Valid @RequestBody BomMaterialListQO request){ public ApiResult<PageData<BomMaterialDTO>> searchBomMaterial(@Valid @RequestBody BomMaterialListQO request){
return ApiResult.success(qcMaterialControllerService.searchBomMaterial(request)); return ApiResult.success(qcMaterialControllerService.searchBomMaterial(request));
} }
} }

8
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsQcMaterialControllerService.java
View File

@ -9,8 +9,8 @@ import com.nflg.wms.common.constant.STATE;
import com.nflg.wms.common.exception.NflgException; import com.nflg.wms.common.exception.NflgException;
import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.ApiResult;
import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.PageData;
import com.nflg.wms.common.pojo.dto.BomMaterialDTO;
import com.nflg.wms.common.pojo.dto.BomPageResultDTO; import com.nflg.wms.common.pojo.dto.BomPageResultDTO;
import com.nflg.wms.common.pojo.dto.MaterialMainDTO;
import com.nflg.wms.common.pojo.dto.QmsQcMaterialImportDTO; import com.nflg.wms.common.pojo.dto.QmsQcMaterialImportDTO;
import com.nflg.wms.common.pojo.qo.BomMaterialListQO; import com.nflg.wms.common.pojo.qo.BomMaterialListQO;
import com.nflg.wms.common.pojo.qo.QmsQcMaterialAddQO; import com.nflg.wms.common.pojo.qo.QmsQcMaterialAddQO;
@ -433,9 +433,9 @@ public class QmsQcMaterialControllerService {
return pathName.toString(); return pathName.toString();
} }
public PageData<MaterialMainDTO> searchBomMaterial(@Valid BomMaterialListQO request) { public PageData<BomMaterialDTO> searchBomMaterial(@Valid BomMaterialListQO request) {
BomPageResultDTO<MaterialMainDTO> bomPageResultDTO = bomMaterialService.searchMaterial(request); BomPageResultDTO<BomMaterialDTO> bomPageResultDTO = bomMaterialService.searchMaterial(request);
return new PageData<MaterialMainDTO>() return new PageData<BomMaterialDTO>()
.setPage(request.getPage()) .setPage(request.getPage())
.setPageSize(request.getPageSize()) .setPageSize(request.getPageSize())
.setTotal((int) bomPageResultDTO.getTotal()) .setTotal((int) bomPageResultDTO.getTotal())

62
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsSamplingPlanControllerService.java
View File

@ -82,8 +82,7 @@ public class QmsSamplingPlanControllerService {
samplingPlanService.save(plan); samplingPlanService.save(plan);
Long planId = plan.getId(); Long planId = plan.getId();
// 2. 保存AQL优先值预定义，并建立优先值到ID的映射 // 2. 保存AQL优先值预定义
Map<java.math.BigDecimal, Long> aqlPriorityValueIdMap = new java.util.HashMap<>();
if (CollectionUtil.isNotEmpty(request.getAqlPriorityValues())) { if (CollectionUtil.isNotEmpty(request.getAqlPriorityValues())) {
List<QmsAqlPriorityValue> aqlPriorityValues = new ArrayList<>(); List<QmsAqlPriorityValue> aqlPriorityValues = new ArrayList<>();
for (QmsSamplingPlanAddQO.AqlPriorityValueQO qo : request.getAqlPriorityValues()) { for (QmsSamplingPlanAddQO.AqlPriorityValueQO qo : request.getAqlPriorityValues()) {
@ -93,10 +92,6 @@ public class QmsSamplingPlanControllerService {
aqlPriorityValues.add(entity); aqlPriorityValues.add(entity);
} }
aqlPriorityValueService.saveBatch(aqlPriorityValues); aqlPriorityValueService.saveBatch(aqlPriorityValues);
// MyBatis-Plus的saveBatch会回填ID，建立映射关系
for (QmsAqlPriorityValue entity : aqlPriorityValues) {
aqlPriorityValueIdMap.put(entity.getPriorityValue(), entity.getId());
}
} }
// 3. 保存抽样严格性转移规则 // 3. 保存抽样严格性转移规则
@ -114,8 +109,7 @@ public class QmsSamplingPlanControllerService {
strictnessTransferRuleService.saveBatch(rules); strictnessTransferRuleService.saveBatch(rules);
} }
// 4. 保存字码，并建立字码到ID的映射 // 4. 保存字码
Map<String, Long> codeLetterIdMap = new java.util.HashMap<>();
if (CollectionUtil.isNotEmpty(request.getCodeLetters())) { if (CollectionUtil.isNotEmpty(request.getCodeLetters())) {
List<QmsCodeLetter> codeLetters = new ArrayList<>(); List<QmsCodeLetter> codeLetters = new ArrayList<>();
for (QmsSamplingPlanAddQO.CodeLetterQO qo : request.getCodeLetters()) { for (QmsSamplingPlanAddQO.CodeLetterQO qo : request.getCodeLetters()) {
@ -125,28 +119,17 @@ public class QmsSamplingPlanControllerService {
codeLetters.add(entity); codeLetters.add(entity);
} }
codeLetterService.saveBatch(codeLetters); codeLetterService.saveBatch(codeLetters);
// MyBatis-Plus的saveBatch会回填ID，建立映射关系
for (QmsCodeLetter entity : codeLetters) {
codeLetterIdMap.put(entity.getCodeLetter(), entity.getId());
}
} }
// 5. 保存字码矩阵维护 // 5. 保存字码矩阵维护
if (CollectionUtil.isNotEmpty(request.getCodeLetterMatrices())) { if (CollectionUtil.isNotEmpty(request.getCodeLetterMatrices())) {
List<QmsCodeLetterMatrix> matrices = new ArrayList<>(); List<QmsCodeLetterMatrix> matrices = new ArrayList<>();
for (QmsSamplingPlanAddQO.CodeLetterMatrixQO qo : request.getCodeLetterMatrices()) { for (QmsSamplingPlanAddQO.CodeLetterMatrixQO qo : request.getCodeLetterMatrices()) {
// 通过字码内容获取字码ID
Long codeLetterId = codeLetterIdMap.get(qo.getCodeLetter());
VUtil.trueThrowBusinessError(codeLetterId == null).throwMessage("字码矩阵维护中的字码[" + qo.getCodeLetter() + "]在字码列表中不存在");
// 通过AQL优先值获取AQL优先值ID
Long aqlPriorityValueId = aqlPriorityValueIdMap.get(qo.getAqlPriorityValue());
VUtil.trueThrowBusinessError(aqlPriorityValueId == null).throwMessage("字码矩阵维护中的AQL优先值[" + qo.getAqlPriorityValue() + "]在AQL优先值列表中不存在");
QmsCodeLetterMatrix entity = new QmsCodeLetterMatrix() QmsCodeLetterMatrix entity = new QmsCodeLetterMatrix()
.setSamplingPlanId(planId) .setSamplingPlanId(planId)
.setInspectionType(qo.getInspectionType()) .setInspectionType(qo.getInspectionType())
.setCodeLetterId(codeLetterId) .setCodeLetterId(qo.getCodeLetterId())
.setAqlPriorityValueId(aqlPriorityValueId) .setAqlPriorityValueId(qo.getAqlPriorityValueId())
.setSampleSize(qo.getSampleSize()) .setSampleSize(qo.getSampleSize())
.setReValue(qo.getReValue()) .setReValue(qo.getReValue())
.setAcValue(qo.getAcValue()); .setAcValue(qo.getAcValue());
@ -159,16 +142,12 @@ public class QmsSamplingPlanControllerService {
if (CollectionUtil.isNotEmpty(request.getSamplingPlanInspections())) { if (CollectionUtil.isNotEmpty(request.getSamplingPlanInspections())) {
List<QmsSamplingPlanInspection> inspections = new ArrayList<>(); List<QmsSamplingPlanInspection> inspections = new ArrayList<>();
for (QmsSamplingPlanAddQO.SamplingPlanInspectionQO qo : request.getSamplingPlanInspections()) { for (QmsSamplingPlanAddQO.SamplingPlanInspectionQO qo : request.getSamplingPlanInspections()) {
// 通过字码内容获取字码ID
Long codeLetterId = codeLetterIdMap.get(qo.getCodeLetter());
VUtil.trueThrowBusinessError(codeLetterId == null).throwMessage("抽样方案检验中的字码[" + qo.getCodeLetter() + "]在字码列表中不存在");
QmsSamplingPlanInspection entity = new QmsSamplingPlanInspection() QmsSamplingPlanInspection entity = new QmsSamplingPlanInspection()
.setSamplingPlanId(planId) .setSamplingPlanId(planId)
.setRangeStart(qo.getRangeStart()) .setRangeStart(qo.getRangeStart())
.setRangeEnd(qo.getRangeEnd()) .setRangeEnd(qo.getRangeEnd())
.setInspectionDictionaryItemId(qo.getInspectionDictionaryItemId()) .setInspectionDictionaryItemId(qo.getInspectionDictionaryItemId())
.setCodeLetterId(codeLetterId); .setCodeLetterId(qo.getCodeLetterId());
inspections.add(entity); inspections.add(entity);
} }
samplingPlanInspectionService.saveBatch(inspections); samplingPlanInspectionService.saveBatch(inspections);
@ -202,8 +181,7 @@ public class QmsSamplingPlanControllerService {
.set(QmsSamplingPlan::getUpdateTime, now) .set(QmsSamplingPlan::getUpdateTime, now)
.update(); .update();
// 2. 删除并重新保存AQL优先值预定义，并建立优先值到ID的映射 // 2. 删除并重新保存AQL优先值预定义
Map<java.math.BigDecimal, Long> aqlPriorityValueIdMap = new java.util.HashMap<>();
aqlPriorityValueService.lambdaUpdate() aqlPriorityValueService.lambdaUpdate()
.eq(QmsAqlPriorityValue::getSamplingPlanId, planId) .eq(QmsAqlPriorityValue::getSamplingPlanId, planId)
.remove(); .remove();
@ -216,10 +194,6 @@ public class QmsSamplingPlanControllerService {
aqlPriorityValues.add(entity); aqlPriorityValues.add(entity);
} }
aqlPriorityValueService.saveBatch(aqlPriorityValues); aqlPriorityValueService.saveBatch(aqlPriorityValues);
// MyBatis-Plus的saveBatch会回填ID，建立映射关系
for (QmsAqlPriorityValue entity : aqlPriorityValues) {
aqlPriorityValueIdMap.put(entity.getPriorityValue(), entity.getId());
}
} }
// 3. 删除并重新保存抽样严格性转移规则 // 3. 删除并重新保存抽样严格性转移规则
@ -240,8 +214,7 @@ public class QmsSamplingPlanControllerService {
strictnessTransferRuleService.saveBatch(rules); strictnessTransferRuleService.saveBatch(rules);
} }
// 4. 删除并重新保存字码，并建立字码到ID的映射 // 4. 删除并重新保存字码
Map<String, Long> codeLetterIdMap = new java.util.HashMap<>();
codeLetterService.lambdaUpdate() codeLetterService.lambdaUpdate()
.eq(QmsCodeLetter::getSamplingPlanId, planId) .eq(QmsCodeLetter::getSamplingPlanId, planId)
.remove(); .remove();
@ -254,10 +227,6 @@ public class QmsSamplingPlanControllerService {
codeLetters.add(entity); codeLetters.add(entity);
} }
codeLetterService.saveBatch(codeLetters); codeLetterService.saveBatch(codeLetters);
// MyBatis-Plus的saveBatch会回填ID，建立映射关系
for (QmsCodeLetter entity : codeLetters) {
codeLetterIdMap.put(entity.getCodeLetter(), entity.getId());
}
} }
// 5. 删除并重新保存字码矩阵维护 // 5. 删除并重新保存字码矩阵维护
@ -267,18 +236,11 @@ public class QmsSamplingPlanControllerService {
if (CollectionUtil.isNotEmpty(request.getCodeLetterMatrices())) { if (CollectionUtil.isNotEmpty(request.getCodeLetterMatrices())) {
List<QmsCodeLetterMatrix> matrices = new ArrayList<>(); List<QmsCodeLetterMatrix> matrices = new ArrayList<>();
for (QmsSamplingPlanAddQO.CodeLetterMatrixQO qo : request.getCodeLetterMatrices()) { for (QmsSamplingPlanAddQO.CodeLetterMatrixQO qo : request.getCodeLetterMatrices()) {
// 通过字码内容获取字码ID
Long codeLetterId = codeLetterIdMap.get(qo.getCodeLetter());
VUtil.trueThrowBusinessError(codeLetterId == null).throwMessage("字码矩阵维护中的字码[" + qo.getCodeLetter() + "]在字码列表中不存在");
// 通过AQL优先值获取AQL优先值ID
Long aqlPriorityValueId = aqlPriorityValueIdMap.get(qo.getAqlPriorityValue());
VUtil.trueThrowBusinessError(aqlPriorityValueId == null).throwMessage("字码矩阵维护中的AQL优先值[" + qo.getAqlPriorityValue() + "]在AQL优先值列表中不存在");
QmsCodeLetterMatrix entity = new QmsCodeLetterMatrix() QmsCodeLetterMatrix entity = new QmsCodeLetterMatrix()
.setSamplingPlanId(planId) .setSamplingPlanId(planId)
.setInspectionType(qo.getInspectionType()) .setInspectionType(qo.getInspectionType())
.setCodeLetterId(codeLetterId) .setCodeLetterId(qo.getCodeLetterId())
.setAqlPriorityValueId(aqlPriorityValueId) .setAqlPriorityValueId(qo.getAqlPriorityValueId())
.setSampleSize(qo.getSampleSize()) .setSampleSize(qo.getSampleSize())
.setReValue(qo.getReValue()) .setReValue(qo.getReValue())
.setAcValue(qo.getAcValue()); .setAcValue(qo.getAcValue());
@ -294,16 +256,12 @@ public class QmsSamplingPlanControllerService {
if (CollectionUtil.isNotEmpty(request.getSamplingPlanInspections())) { if (CollectionUtil.isNotEmpty(request.getSamplingPlanInspections())) {
List<QmsSamplingPlanInspection> inspections = new ArrayList<>(); List<QmsSamplingPlanInspection> inspections = new ArrayList<>();
for (QmsSamplingPlanAddQO.SamplingPlanInspectionQO qo : request.getSamplingPlanInspections()) { for (QmsSamplingPlanAddQO.SamplingPlanInspectionQO qo : request.getSamplingPlanInspections()) {
// 通过字码内容获取字码ID
Long codeLetterId = codeLetterIdMap.get(qo.getCodeLetter());
VUtil.trueThrowBusinessError(codeLetterId == null).throwMessage("抽样方案检验中的字码[" + qo.getCodeLetter() + "]在字码列表中不存在");
QmsSamplingPlanInspection entity = new QmsSamplingPlanInspection() QmsSamplingPlanInspection entity = new QmsSamplingPlanInspection()
.setSamplingPlanId(planId) .setSamplingPlanId(planId)
.setRangeStart(qo.getRangeStart()) .setRangeStart(qo.getRangeStart())
.setRangeEnd(qo.getRangeEnd()) .setRangeEnd(qo.getRangeEnd())
.setInspectionDictionaryItemId(qo.getInspectionDictionaryItemId()) .setInspectionDictionaryItemId(qo.getInspectionDictionaryItemId())
.setCodeLetterId(codeLetterId); .setCodeLetterId(qo.getCodeLetterId());
inspections.add(entity); inspections.add(entity);
} }
samplingPlanInspectionService.saveBatch(inspections); samplingPlanInspectionService.saveBatch(inspections);

10
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QualityNotificationControllerService.java
View File

@ -69,7 +69,7 @@ public class QualityNotificationControllerService {
.setTitle(request.getTitle()) .setTitle(request.getTitle())
.setTargetType(request.getTargetType()) .setTargetType(request.getTargetType())
.setContent(request.getContent()) .setContent(request.getContent())
.setEnable(true) // 默认启用 .setState(1) // 默认启用
.setCreateById(operatorId) .setCreateById(operatorId)
.setCreateBy(operator) .setCreateBy(operator)
.setCreateTime(now) .setCreateTime(now)
@ -165,7 +165,7 @@ public class QualityNotificationControllerService {
vo.setTitle(entity.getTitle()); vo.setTitle(entity.getTitle());
vo.setTargetType(entity.getTargetType()); vo.setTargetType(entity.getTargetType());
vo.setContent(entity.getContent()); vo.setContent(entity.getContent());
vo.setEnable(entity.getEnable()); vo.setState(entity.getState());
vo.setCreateById(entity.getCreateById()); vo.setCreateById(entity.getCreateById());
vo.setCreateBy(entity.getCreateBy()); vo.setCreateBy(entity.getCreateBy());
vo.setCreateTime(entity.getCreateTime()); vo.setCreateTime(entity.getCreateTime());
@ -253,8 +253,8 @@ public class QualityNotificationControllerService {
vo.setTargetTypeName(vo.getTargetType() == 1 ? "全部" : "手动选择"); vo.setTargetTypeName(vo.getTargetType() == 1 ? "全部" : "手动选择");
} }
// 启用状态名称 // 启用状态名称
if (vo.getEnable() != null) { if (vo.getState() != null) {
vo.setEnableName(vo.getEnable() ? "启用" : "禁用"); vo.setStateName(vo.getState() == 1 ? "启用" : "禁用");
} }
} }
@ -272,7 +272,7 @@ public class QualityNotificationControllerService {
qualityNotificationService.lambdaUpdate() qualityNotificationService.lambdaUpdate()
.eq(QmsQualityNotification::getId, id) .eq(QmsQualityNotification::getId, id)
.set(QmsQualityNotification::getEnable, enable) .set(QmsQualityNotification::getState, enable ? 1 : 2)
.set(QmsQualityNotification::getUpdateById, operatorId) .set(QmsQualityNotification::getUpdateById, operatorId)
.set(QmsQualityNotification::getUpdateBy, operator) .set(QmsQualityNotification::getUpdateBy, operator)
.set(QmsQualityNotification::getUpdateTime, now) .set(QmsQualityNotification::getUpdateTime, now)

10
nflg-qms-admin/src/test/java/com/nflg/qms/admin/QmsSamplingPlanApiTest.java
View File

@ -236,13 +236,13 @@ public class QmsSamplingPlanApiTest {
request.setCodeLetters(codeLetters); request.setCodeLetters(codeLetters);
// 构建字码矩阵维护列表 // 构建字码矩阵维护列表
// 使用字码内容和AQL优先值来关联，而不是ID // 注意：codeLetterId 和 aqlPriorityValueId 应该是数据库中已存在的ID
// 字码内容需要在codeLetters列表中存在，AQL优先值需要在aqlPriorityValues列表中存在 // 这里使用占位符ID，测试时需要根据实际数据调整
List<QmsSamplingPlanAddQO.CodeLetterMatrixQO> matrices = new ArrayList<>(); List<QmsSamplingPlanAddQO.CodeLetterMatrixQO> matrices = new ArrayList<>();
QmsSamplingPlanAddQO.CodeLetterMatrixQO matrix = new QmsSamplingPlanAddQO.CodeLetterMatrixQO(); QmsSamplingPlanAddQO.CodeLetterMatrixQO matrix = new QmsSamplingPlanAddQO.CodeLetterMatrixQO();
matrix.setInspectionType((short) 0); // 正常检查 matrix.setInspectionType((short) 0); // 正常检查
matrix.setCodeLetter("A"); // 关联字码列表中的"A" matrix.setCodeLetterId(1L);
matrix.setAqlPriorityValue(new BigDecimal("0.010")); // 关联AQL优先值列表中的0.010 matrix.setAqlPriorityValueId(1L);
matrix.setSampleSize(125); matrix.setSampleSize(125);
matrix.setReValue(3); matrix.setReValue(3);
matrix.setAcValue(3); matrix.setAcValue(3);
@ -255,7 +255,7 @@ public class QmsSamplingPlanApiTest {
inspection.setRangeStart(1201); inspection.setRangeStart(1201);
inspection.setRangeEnd(3200); inspection.setRangeEnd(3200);
inspection.setInspectionDictionaryItemId(1L); inspection.setInspectionDictionaryItemId(1L);
inspection.setCodeLetter("A"); // 关联字码列表中的"A" inspection.setCodeLetterId(1L);
inspections.add(inspection); inspections.add(inspection);
request.setSamplingPlanInspections(inspections); request.setSamplingPlanInspections(inspections);

5
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/MaterialController.java
View File

@ -4,13 +4,14 @@ import com.nflg.wms.admin.service.MaterialControllerService;
import com.nflg.wms.common.constant.UserType; import com.nflg.wms.common.constant.UserType;
import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.ApiResult;
import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.PageData;
import com.nflg.wms.common.pojo.dto.BomMaterialDTO;
import com.nflg.wms.common.pojo.dto.MaterialCategoryVO; import com.nflg.wms.common.pojo.dto.MaterialCategoryVO;
import com.nflg.wms.common.pojo.dto.MaterialMainDTO;
import com.nflg.wms.common.pojo.qo.*; import com.nflg.wms.common.pojo.qo.*;
import com.nflg.wms.common.pojo.vo.EbomParentVO; import com.nflg.wms.common.pojo.vo.EbomParentVO;
import com.nflg.wms.common.pojo.vo.MaterialVO; import com.nflg.wms.common.pojo.vo.MaterialVO;
import com.nflg.wms.common.pojo.vo.QueryMaterialsVO; import com.nflg.wms.common.pojo.vo.QueryMaterialsVO;
import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.repository.entity.WmsMaterial;
import com.nflg.wms.starter.BaseController; import com.nflg.wms.starter.BaseController;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
@ -154,7 +155,7 @@ public class MaterialController extends BaseController {
* 搜索主物料系统物料信息 * 搜索主物料系统物料信息
*/ */
@PostMapping("searchBomMaterial") @PostMapping("searchBomMaterial")
public ApiResult<PageData<MaterialMainDTO>> searchBomMaterial(@Valid @RequestBody BomMaterialListQO request){ public ApiResult<PageData<BomMaterialDTO>> searchBomMaterial(@Valid @RequestBody BomMaterialListQO request){
return ApiResult.success(materialControllerService.searchBomMaterial(request)); return ApiResult.success(materialControllerService.searchBomMaterial(request));
} }

5
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/BomControllerService.java
View File

@ -9,7 +9,6 @@ import com.nflg.wms.common.pojo.PageData;
import com.nflg.wms.common.pojo.dto.BomExportExcelDTO; import com.nflg.wms.common.pojo.dto.BomExportExcelDTO;
import com.nflg.wms.common.pojo.dto.BomImportExcelDTO; import com.nflg.wms.common.pojo.dto.BomImportExcelDTO;
import com.nflg.wms.common.pojo.dto.BomMaterialDTO; import com.nflg.wms.common.pojo.dto.BomMaterialDTO;
import com.nflg.wms.common.pojo.dto.MaterialMainDTO;
import com.nflg.wms.common.pojo.qo.BomSearchQO; import com.nflg.wms.common.pojo.qo.BomSearchQO;
import com.nflg.wms.common.pojo.qo.BomUpdateQO; import com.nflg.wms.common.pojo.qo.BomUpdateQO;
import com.nflg.wms.common.pojo.qo.ScanTypeUpdateQO; import com.nflg.wms.common.pojo.qo.ScanTypeUpdateQO;
@ -140,7 +139,7 @@ public class BomControllerService {
if (Objects.isNull(dto.getParentNo())) { if (Objects.isNull(dto.getParentNo())) {
sb.append("父级物料编号不能为空;"); sb.append("父级物料编号不能为空;");
} else { } else {
MaterialMainDTO pm = bomMaterialService.getMaterialInfo(dto.getParentNo()); BomMaterialDTO pm = bomMaterialService.getMaterialInfo(dto.getParentNo());
if (Objects.isNull(pm)) { if (Objects.isNull(pm)) {
sb.append("父级物料编号无效"); sb.append("父级物料编号无效");
} else { } else {
@ -169,7 +168,7 @@ public class BomControllerService {
if (StrUtil.isBlank(dto.getChildNo())) { if (StrUtil.isBlank(dto.getChildNo())) {
sb.append("子级物料编号不能为空;"); sb.append("子级物料编号不能为空;");
} else { } else {
MaterialMainDTO cm = bomMaterialService.getMaterialInfo(dto.getChildNo()); BomMaterialDTO cm = bomMaterialService.getMaterialInfo(dto.getChildNo());
if (Objects.isNull(cm)) { if (Objects.isNull(cm)) {
sb.append("子级物料编号无效;"); sb.append("子级物料编号无效;");
} else if (bom.getParentId() != 0L) { } else if (bom.getParentId() != 0L) {

9
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java
View File

@ -44,6 +44,7 @@ import tech.powerjob.common.request.query.JobInfoQuery;
import tech.powerjob.common.response.JobInfoDTO; import tech.powerjob.common.response.JobInfoDTO;
import tech.powerjob.common.response.ResultDTO; import tech.powerjob.common.response.ResultDTO;
import javax.print.attribute.standard.PrinterURI;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
@ -165,7 +166,7 @@ public class MaterialControllerService {
for (MultipartFile file : files) { for (MultipartFile file : files) {
String name = file.getOriginalFilename(); String name = file.getOriginalFilename();
String materialNo = name.substring(0, name.lastIndexOf(".")); String materialNo = name.substring(0, name.lastIndexOf("."));
MaterialMainDTO bomMaterialDTO = bomMaterialService.getMaterialInfo(materialNo); BomMaterialDTO bomMaterialDTO = bomMaterialService.getMaterialInfo(materialNo);
if (Objects.isNull(bomMaterialDTO)) { if (Objects.isNull(bomMaterialDTO)) {
pics.add(name); pics.add(name);
} else { } else {
@ -224,9 +225,9 @@ public class MaterialControllerService {
} }
} }
public PageData<MaterialMainDTO> searchBomMaterial(@Valid BomMaterialListQO request) { public PageData<BomMaterialDTO> searchBomMaterial(@Valid BomMaterialListQO request) {
BomPageResultDTO<MaterialMainDTO> bomPageResultDTO = bomMaterialService.searchMaterial(request); BomPageResultDTO<BomMaterialDTO> bomPageResultDTO = bomMaterialService.searchMaterial(request);
return new PageData<MaterialMainDTO>() return new PageData<BomMaterialDTO>()
.setPage(request.getPage()) .setPage(request.getPage())
.setPageSize(request.getPageSize()) .setPageSize(request.getPageSize())
.setTotal((int) bomPageResultDTO.getTotal()) .setTotal((int) bomPageResultDTO.getTotal())

15
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StorageControllerService.java
View File

@ -4,11 +4,12 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.nflg.wms.common.constant.Constant; import com.nflg.wms.common.constant.Constant;
import com.nflg.wms.common.constant.STATE; import com.nflg.wms.common.constant.STATE;
import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.ApiResult;
import com.nflg.wms.common.pojo.dto.MaterialMainDTO; import com.nflg.wms.common.pojo.dto.BomMaterialDTO;
import com.nflg.wms.common.pojo.dto.StorageExcelExportDTO; import com.nflg.wms.common.pojo.dto.StorageExcelExportDTO;
import com.nflg.wms.common.pojo.dto.StorageExcelImportDTO; import com.nflg.wms.common.pojo.dto.StorageExcelImportDTO;
import com.nflg.wms.common.pojo.qo.EnableQO; import com.nflg.wms.common.pojo.qo.EnableQO;
@ -20,14 +21,8 @@ import com.nflg.wms.common.util.DateTimeUtil;
import com.nflg.wms.common.util.EecExcelUtil; import com.nflg.wms.common.util.EecExcelUtil;
import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.common.util.VUtil; import com.nflg.wms.common.util.VUtil;
import com.nflg.wms.repository.entity.DictionaryItem; import com.nflg.wms.repository.entity.*;
import com.nflg.wms.repository.entity.WmsBin; import com.nflg.wms.repository.service.*;
import com.nflg.wms.repository.entity.WmsStorage;
import com.nflg.wms.repository.entity.WmsWarehouse;
import com.nflg.wms.repository.service.IDictionaryItemService;
import com.nflg.wms.repository.service.IWmsBinService;
import com.nflg.wms.repository.service.IWmsStorageService;
import com.nflg.wms.repository.service.IWmsWarehouseService;
import com.nflg.wms.starter.service.BomMaterialService; import com.nflg.wms.starter.service.BomMaterialService;
import com.nflg.wms.starter.service.FileUploadService; import com.nflg.wms.starter.service.FileUploadService;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
@ -151,7 +146,7 @@ public class StorageControllerService {
if (StrUtil.isBlank(dto.getMaterialNo())) { if (StrUtil.isBlank(dto.getMaterialNo())) {
sb.append("物料编号不能为空;"); sb.append("物料编号不能为空;");
} else { } else {
MaterialMainDTO material = bomMaterialService.getMaterialInfo(dto.getMaterialNo()); BomMaterialDTO material = bomMaterialService.getMaterialInfo(dto.getMaterialNo());
if (Objects.isNull(material)) { if (Objects.isNull(material)) {
sb.append("物料编号无效;"); sb.append("物料编号无效;");
} else { } else {

16
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java
View File

@ -2,32 +2,30 @@ package com.nflg.wms.admin.service;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Pair;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.nflg.wms.admin.pojo.dto.PdfPageDTO; import com.nflg.wms.admin.pojo.dto.PdfPageDTO;
import com.nflg.wms.admin.pojo.dto.ZWM3A17DTO;
import com.nflg.wms.admin.pojo.dto.ZWM3A17Item1DTO;
import com.nflg.wms.admin.util.PdfGeneratorUtil; import com.nflg.wms.admin.util.PdfGeneratorUtil;
import com.nflg.wms.admin.util.QRCodeUtil; import com.nflg.wms.admin.util.QRCodeUtil;
import com.nflg.wms.admin.util.ThymeleafUtil; import com.nflg.wms.admin.util.ThymeleafUtil;
import com.nflg.wms.common.constant.Constant;
import com.nflg.wms.common.constant.STATE; import com.nflg.wms.common.constant.STATE;
import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.ApiResult;
import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.PageData;
import com.nflg.wms.common.pojo.dto.MaterialMainDTO; import com.nflg.wms.common.pojo.dto.*;
import com.nflg.wms.common.pojo.dto.PackageMaterialDTO;
import com.nflg.wms.common.pojo.dto.PackageMaterialExcelExportDTO;
import com.nflg.wms.common.pojo.dto.PackageMaterialExcelImportDTO;
import com.nflg.wms.common.pojo.qo.*; import com.nflg.wms.common.pojo.qo.*;
import com.nflg.wms.common.pojo.vo.PackageVO; import com.nflg.wms.common.pojo.vo.PackageVO;
import com.nflg.wms.common.util.DateTimeUtil; import com.nflg.wms.common.util.DateTimeUtil;
import com.nflg.wms.common.util.EecExcelUtil; import com.nflg.wms.common.util.EecExcelUtil;
import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.common.util.VUtil; import com.nflg.wms.common.util.VUtil;
import com.nflg.wms.repository.entity.WmsInTaskItem; import com.nflg.wms.repository.entity.*;
import com.nflg.wms.repository.entity.WmsMaterial;
import com.nflg.wms.repository.entity.WmsModel;
import com.nflg.wms.repository.entity.WmsStructuralPackage;
import com.nflg.wms.repository.service.*; import com.nflg.wms.repository.service.*;
import com.nflg.wms.starter.service.BomMaterialService; import com.nflg.wms.starter.service.BomMaterialService;
import com.nflg.wms.starter.service.FileUploadService; import com.nflg.wms.starter.service.FileUploadService;
@ -314,7 +312,7 @@ public class StructuralPackageControllerService {
case 2: case 2:
String no = row.getString(1); String no = row.getString(1);
VUtil.trueThrowBusinessError(StrUtil.isBlank(no)).throwMessage("钢构包编码不能为空"); VUtil.trueThrowBusinessError(StrUtil.isBlank(no)).throwMessage("钢构包编码不能为空");
MaterialMainDTO material = bomMaterialService.getMaterialInfo(no); BomMaterialDTO material = bomMaterialService.getMaterialInfo(no);
VUtil.trueThrowBusinessError(Objects.isNull(material)).throwMessage("钢构包编码无效"); VUtil.trueThrowBusinessError(Objects.isNull(material)).throwMessage("钢构包编码无效");
packageInfo.setNo(no); packageInfo.setNo(no);
packageInfo.setName(material.getMaterialDesc()); packageInfo.setName(material.getMaterialDesc());

54
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/MaterialMainDTO.java
View File

@ -1,54 +0,0 @@
package com.nflg.wms.common.pojo.dto;
import lombok.Data;
@Data
public class MaterialMainDTO {
private Long rowId;
private String materialNo;
private String materialName;
private String materialDesc;
private String materialDescEn;
private String drawingNo;
/**
* 物料单位
*/
private String materialUnit;
/**
* 物料状态 1:激活 2:禁止采购 3:售后专用 4:冻结 5:完全弃用
*/
private Integer materialState;
/**
* 一级分类编号
*/
private String firstMaterialCategoryCode;
/**
* 二级分类编号
*/
private String secondMaterialCategoryCode;
/**
* 三级分类编号
*/
private String thirdMaterialCategoryCode;
/**
* 大类/中类/小类/细分类
*/
private String oldCategoryNameTree;
/**
* 物料规格
*/
private String materialSpecifications;
}

8
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/BomMaterialListQO.java
View File

@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class BomMaterialListQO extends PageQO { public class BomMaterialListQO extends PageQO{
/** /**
* 物料编号 * 物料编号
@ -22,10 +22,10 @@ public class BomMaterialListQO extends PageQO {
/** /**
* 物料分类，不需要设置 * 物料分类，不需要设置
*/ */
private int materialClass = 0; private int materialClass=0;
/** /**
* 分类编码 * 物料一级分类编码
*/ */
private String materialCategoryCode; private String firstMaterialCategoryCode;
} }

4
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsExemptMaterialSearchQO.java
View File

@ -31,9 +31,9 @@ public class QmsExemptMaterialSearchQO extends PageQO {
private Integer auditStatus; private Integer auditStatus;
/** /**
* 启用状态：true=启用，false=禁用 * 启用状态；false 禁用；true 启用
*/ */
private Boolean enable; private Boolean enableStatus;
/** /**
* 有效开始日期 - 起始 * 有效开始日期 - 起始

4
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsQualityNotificationSearchQO.java
View File

@ -21,7 +21,7 @@ public class QmsQualityNotificationSearchQO extends SearchBaseQO {
private Long notificationTypeId; private Long notificationTypeId;
/** /**
* 启用状态：true=启用，false=禁用 * 启用状态：1=启用，2=禁用
*/ */
private Boolean enable; private Integer state;
} }

18
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsSamplingPlanAddQO.java
View File

@ -126,16 +126,16 @@ public class QmsSamplingPlanAddQO {
private Short inspectionType; private Short inspectionType;
/** /**
* 字码（关联codeLetters中的字码） * 字码ID
*/ */
@NotBlank(message = "字码不能为空") @NotNull(message = "字码ID不能为空")
private String codeLetter; private Long codeLetterId;
/** /**
* AQL优先值（关联aqlPriorityValues中的优先值） * AQL优先值ID
*/ */
@NotNull(message = "AQL优先值不能为空") @NotNull(message = "AQL优先值ID不能为空")
private BigDecimal aqlPriorityValue; private Long aqlPriorityValueId;
/** /**
* 样本量 * 样本量
@ -180,9 +180,9 @@ public class QmsSamplingPlanAddQO {
private Long inspectionDictionaryItemId; private Long inspectionDictionaryItemId;
/** /**
* 字码（关联codeLetters中的字码） * 字码ID
*/ */
@NotBlank(message = "字码不能为空") @NotNull(message = "字码ID不能为空")
private String codeLetter; private Long codeLetterId;
} }
} }

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ToggleEnableQO.java
View File

@ -9,5 +9,5 @@ import lombok.Data;
public class ToggleEnableQO { public class ToggleEnableQO {
private Long id; private Long id;
private Boolean enable; private Boolean enableStatus;
} }

4
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsExemptMaterialVO.java
View File

@ -51,9 +51,9 @@ public class QmsExemptMaterialVO {
private String rejectReason; private String rejectReason;
/** /**
* 启用状态：true=启用，false=禁用 * 启用状态；false 禁用；true 启用
*/ */
private Boolean enable; private Boolean enableStatus;
/** /**
* 免检模式；0 永久；1 周期 * 免检模式；0 永久；1 周期

6
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityNotificationVO.java
View File

@ -44,14 +44,14 @@ public class QmsQualityNotificationVO {
private String content; private String content;
/** /**
* 启用状态：true=启用，false=禁用 * 启用状态：1=启用，2=禁用
*/ */
private Boolean enable; private Integer state;
/** /**
* 启用状态名称 * 启用状态名称
*/ */
private String enableName; private String stateName;
/** /**
* 创建人ID * 创建人ID

4
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsExemptMaterial.java
View File

@ -44,9 +44,9 @@ public class QmsExemptMaterial implements Serializable {
private Integer auditStatus; private Integer auditStatus;
/** /**
* 启用状态：true=启用，false=禁用 * 启用状态；false 禁用；true 启用
*/ */
private Boolean enable; private Boolean enableStatus;
/** /**
* 免检模式；0 永久；1 周期 * 免检模式；0 永久；1 周期

4
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsQualityNotification.java
View File

@ -47,9 +47,9 @@ public class QmsQualityNotification implements Serializable {
private String content; private String content;
/** /**
* 启用状态：true=启用，false=禁用 * 启用状态：1=启用，2=禁用
*/ */
private Boolean enable; private Integer state;
/** /**
* 创建人ID * 创建人ID

2
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsExemptMaterialService.java
View File

@ -38,7 +38,7 @@ public interface IQmsExemptMaterialService extends IService<QmsExemptMaterial> {
/** /**
* 启用/禁用切换 * 启用/禁用切换
*/ */
void toggleEnable(Long id, Boolean enable); void toggleEnable(Long id, Boolean enableStatus);
/** /**
* 审核免检物料 * 审核免检物料

6
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsExemptMaterialServiceImpl.java
View File

@ -85,7 +85,7 @@ public class QmsExemptMaterialServiceImpl extends ServiceImpl<QmsExemptMaterialM
entity.setSupplierId(supplierId); entity.setSupplierId(supplierId);
entity.setMaterialNo(materialNo); entity.setMaterialNo(materialNo);
entity.setAuditStatus(0); entity.setAuditStatus(0);
entity.setEnable(true); entity.setEnableStatus(true);
entity.setCreateBy(userId); entity.setCreateBy(userId);
entity.setCreateByName(userName); entity.setCreateByName(userName);
entity.setCreateTime(now); entity.setCreateTime(now);
@ -123,12 +123,12 @@ public class QmsExemptMaterialServiceImpl extends ServiceImpl<QmsExemptMaterialM
} }
@Override @Override
public void toggleEnable(Long id, Boolean enable) { public void toggleEnable(Long id, Boolean enableStatus) {
QmsExemptMaterial entity = this.getById(id); QmsExemptMaterial entity = this.getById(id);
if (entity == null) { if (entity == null) {
throw new NflgException(STATE.BusinessError, "记录不存在"); throw new NflgException(STATE.BusinessError, "记录不存在");
} }
entity.setEnable(enable); entity.setEnableStatus(enableStatus);
entity.setUpdateBy(UserUtil.getUserId()); entity.setUpdateBy(UserUtil.getUserId());
entity.setUpdateByName(UserUtil.getUserName()); entity.setUpdateByName(UserUtil.getUserName());
entity.setUpdateTime(LocalDateTime.now()); entity.setUpdateTime(LocalDateTime.now());

10
nflg-wms-repository/src/main/resources/mapper/QmsExemptMaterialMapper.xml
View File

@ -12,7 +12,7 @@
em.material_no, em.material_no,
qm.material_desc, qm.material_desc,
em.audit_status, em.audit_status,
em.enable, em.enable_status,
em.exempt_mode, em.exempt_mode,
em.valid_start_date, em.valid_start_date,
em.valid_end_date, em.valid_end_date,
@ -45,8 +45,8 @@
<if test="request.auditStatus != null"> <if test="request.auditStatus != null">
AND em.audit_status = #{request.auditStatus} AND em.audit_status = #{request.auditStatus}
</if> </if>
<if test="request.enable != null"> <if test="request.enableStatus != null">
AND em.enable = #{request.enable} AND em.enable_status = #{request.enableStatus}
</if> </if>
<if test="request.validStartDateBegin != null"> <if test="request.validStartDateBegin != null">
AND em.valid_start_date &gt;= #{request.validStartDateBegin} AND em.valid_start_date &gt;= #{request.validStartDateBegin}
@ -80,7 +80,7 @@
em.material_no, em.material_no,
qm.material_desc, qm.material_desc,
em.audit_status, em.audit_status,
em.enable, em.enable_status,
em.exempt_mode, em.exempt_mode,
em.valid_start_date, em.valid_start_date,
em.valid_end_date, em.valid_end_date,
@ -112,7 +112,7 @@
em.material_no, em.material_no,
qm.material_desc, qm.material_desc,
em.audit_status, em.audit_status,
em.enable, em.enable_status,
em.exempt_mode, em.exempt_mode,
em.valid_start_date, em.valid_start_date,
em.valid_end_date, em.valid_end_date,

6
nflg-wms-repository/src/main/resources/mapper/QmsQualityNotificationMapper.xml
View File

@ -9,7 +9,7 @@
q.title, q.title,
q.target_type, q.target_type,
q.content, q.content,
q.enable, q.state,
q.create_by_id, q.create_by_id,
q.create_by, q.create_by,
q.create_time, q.create_time,
@ -25,8 +25,8 @@
<if test="request.notificationTypeId != null"> <if test="request.notificationTypeId != null">
AND q.notification_type_id = #{request.notificationTypeId} AND q.notification_type_id = #{request.notificationTypeId}
</if> </if>
<if test="request.enable != null"> <if test="request.state != null">
AND q.enable = #{request.enable} AND q.state = #{request.state}
</if> </if>
<if test="request.startDate != null"> <if test="request.startDate != null">
AND q.create_time &gt;= #{request.startDate} AND q.create_time &gt;= #{request.startDate}

5
nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/processor/MaterialZipImportProcessor.java
View File

@ -5,7 +5,7 @@ import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.nflg.wms.common.constant.UserType; import com.nflg.wms.common.constant.UserType;
import com.nflg.wms.common.pojo.dto.MaterialMainDTO; import com.nflg.wms.common.pojo.dto.BomMaterialDTO;
import com.nflg.wms.repository.entity.WmsMaterial; import com.nflg.wms.repository.entity.WmsMaterial;
import com.nflg.wms.repository.service.IWmsMaterialService; import com.nflg.wms.repository.service.IWmsMaterialService;
import com.nflg.wms.starter.service.BomMaterialService; import com.nflg.wms.starter.service.BomMaterialService;
@ -27,6 +27,7 @@ import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream; import java.util.zip.ZipInputStream;
@ -68,7 +69,7 @@ public class MaterialZipImportProcessor implements BasicProcessor {
} }
String materialNo = name.substring(0, name.lastIndexOf(".")); String materialNo = name.substring(0, name.lastIndexOf("."));
omsLogger.info("物料编号:{}", materialNo); omsLogger.info("物料编号:{}", materialNo);
MaterialMainDTO bomMaterialDTO = bomMaterialService.getMaterialInfo(materialNo); BomMaterialDTO bomMaterialDTO = bomMaterialService.getMaterialInfo(materialNo);
if (Objects.isNull(bomMaterialDTO)) { if (Objects.isNull(bomMaterialDTO)) {
omsLogger.error("主数据中未查找到该物料:{}", materialNo); omsLogger.error("主数据中未查找到该物料:{}", materialNo);
} else { } else {

15
nflg-wms-starter/src/main/java/com/nflg/wms/starter/service/BomMaterialService.java
View File

@ -106,13 +106,13 @@ public class BomMaterialService {
return Optional.ofNullable(resultDTO.getData()).orElse(Collections.emptyList()); return Optional.ofNullable(resultDTO.getData()).orElse(Collections.emptyList());
} }
public MaterialMainDTO getMaterialInfo(String no) { public BomMaterialDTO getMaterialInfo(String no) {
VUtil.trueThrowBusinessError(StrUtil.isBlank(no)).throwMessage("物料编号不能为空"); VUtil.trueThrowBusinessError(StrUtil.isBlank(no)).throwMessage("物料编号不能为空");
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON); headers.setContentType(MediaType.APPLICATION_JSON);
headers.add("authorization", getToken()); headers.add("authorization", getToken());
HttpEntity<Void> requestEntity = new HttpEntity<>(null, headers); HttpEntity<Void> requestEntity = new HttpEntity<>(null, headers);
ResponseEntity<BomResultDTO<MaterialMainDTO>> response = restTemplate.exchange( ResponseEntity<BomResultDTO<BomMaterialDTO>> response = restTemplate.exchange(
baseUrl + materialInfoUrl + no, baseUrl + materialInfoUrl + no,
HttpMethod.GET, HttpMethod.GET,
requestEntity, requestEntity,
@ -122,32 +122,29 @@ public class BomMaterialService {
log.info("查询主物料系统返回状态码:" + response.getStatusCode().value()); log.info("查询主物料系统返回状态码:" + response.getStatusCode().value());
VUtil.trueThrowBusinessError(!response.getStatusCode().is2xxSuccessful()) VUtil.trueThrowBusinessError(!response.getStatusCode().is2xxSuccessful())
.throwMessage("查询主物料系统失败"); .throwMessage("查询主物料系统失败");
BomResultDTO<MaterialMainDTO> resultDTO = response.getBody(); BomResultDTO<BomMaterialDTO> resultDTO = response.getBody();
log.info("查询主物料系统返回数据:" + JSONUtil.toJsonStr(resultDTO)); log.info("查询主物料系统返回数据:" + JSONUtil.toJsonStr(resultDTO));
return resultDTO.getData(); return resultDTO.getData();
} }
public BomPageResultDTO<MaterialMainDTO> searchMaterial(BomMaterialListQO qo) { public BomPageResultDTO<BomMaterialDTO> searchMaterial(BomMaterialListQO qo) {
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON); headers.setContentType(MediaType.APPLICATION_JSON);
headers.add("authorization", getToken()); headers.add("authorization", getToken());
HttpEntity<BomMaterialListQO> requestEntity = new HttpEntity<>(qo, headers); HttpEntity<BomMaterialListQO> requestEntity = new HttpEntity<>(qo, headers);
ResponseEntity<BomResultDTO<BomPageResultDTO<MaterialMainDTO>>> response = restTemplate.exchange( ResponseEntity<BomResultDTO<BomPageResultDTO<BomMaterialDTO>>> response = restTemplate.exchange(
baseUrl + materialSearchUrl, baseUrl + materialSearchUrl,
HttpMethod.POST, HttpMethod.POST,
requestEntity, requestEntity,
new ParameterizedTypeReference<>() { new ParameterizedTypeReference<>() {
} }
); );
// ResponseEntity<String> responseEntity=restTemplate.postForEntity(baseUrl + materialSearchUrl, requestEntity, String.class);
log.info("查询主物料系统返回状态码:" + response.getStatusCode().value()); log.info("查询主物料系统返回状态码:" + response.getStatusCode().value());
VUtil.trueThrowBusinessError(!response.getStatusCode().is2xxSuccessful()) VUtil.trueThrowBusinessError(!response.getStatusCode().is2xxSuccessful())
.throwMessage("查询主物料系统失败"); .throwMessage("查询主物料系统失败");
BomResultDTO<BomPageResultDTO<MaterialMainDTO>> resultDTO = response.getBody(); BomResultDTO<BomPageResultDTO<BomMaterialDTO>> resultDTO = response.getBody();
log.info("查询主物料系统返回数据:" + JSONUtil.toJsonStr(resultDTO)); log.info("查询主物料系统返回数据:" + JSONUtil.toJsonStr(resultDTO));
return resultDTO.getData(); return resultDTO.getData();
// log.info("查询主物料系统返回数据:" +responseEntity.getBody());
// return new BomPageResultDTO();
} }
private String getToken() { private String getToken() {