From 6ce05ca36d8732803b619a7d780e5cb6ad58f0c7 Mon Sep 17 00:00:00 2001 From: zhengxuming Date: Mon, 4 Aug 2025 14:36:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=8E=9F=E6=96=99=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PdaIosInServiceImpl.java | 13 +++++++++++++ .../service/util/tasks/zw/InBillTask.java | 1 + 2 files changed, 14 insertions(+) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java index c1660aa..50f29cf 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java @@ -32,6 +32,8 @@ import org.nl.wms.pda_manage.ios_manage.dto.ZwConfirmInParamDto; import org.nl.wms.pda_manage.ios_manage.service.PdaIosInService; import org.nl.wms.pda_manage.ios_manage.service.PdaIosOutService; import org.nl.wms.pda_manage.util.PdaResponse; +import org.nl.wms.pm_manage.service.IPmFormDataService; +import org.nl.wms.pm_manage.service.dao.PmFormData; import org.nl.wms.sch_manage.enums.StatusEnum; import org.nl.wms.sch_manage.enums.TaskEnum; import org.nl.wms.sch_manage.enums.TaskStatus; @@ -187,6 +189,9 @@ public class PdaIosInServiceImpl implements PdaIosInService { @Autowired private ISchBaseRegionService iSchBaseRegionService; + @Autowired + private IPmFormDataService iPmFormDataService; + @Override public PdaResponse groupPlate(JSONObject whereJson) { @@ -560,6 +565,14 @@ public class PdaIosInServiceImpl implements PdaIosInService { throw new BadRequestException("字典MATERIAL_MODEL_SECT未配置，请核对！"); } + List formDataList = iPmFormDataService.list(new LambdaUpdateWrapper() + .eq(PmFormData::getCode, dto.getFormDataCode()) + .eq(PmFormData::getStatus, IOSEnum.BILL_STATUS.code("完成"))); + + if(CollectionUtils.isNotEmpty(formDataList)){ + throw new BadRequestException("单据" +dto.getFormDataCode() +"已完成！"); + } + //循环判断每个 如果有问题，则抛出异常 String lastSchBasePoint = null; Integer taskGroupSeq = 0 ; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/InBillTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/InBillTask.java index 1146582..458f66a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/InBillTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/zw/InBillTask.java @@ -204,6 +204,7 @@ public class InBillTask extends AbstractTask { iPmFormDataService.update( new LambdaUpdateWrapper() .set(PmFormData::getStatus,IOSEnum.BILL_STATUS.code("完成")) + .set(PmFormData::getIs_finish, 1) .set(PmFormData::getUpdate_time,DateUtil.now()) .set(PmFormData::getUpdate_name, "task") .eq(PmFormData::getCode, taskObj.getForm_data_code()));