From c74969d8e4b9bdb03a00c699d07acb259641df9a Mon Sep 17 00:00:00 2001 From: rq Date: Tue, 27 Dec 2022 19:34:15 +0800 Subject: [PATCH] 11 --- .../controller/DailyPlanController.java | 15 +++++++++++++++ .../modules/production/entity/CardPrintData.java | 11 +++++++++++ .../production/service/DailyPlanService.java | 11 +++++++++++ .../service/impl/DailyPlanServiceImpl.java | 15 +++++++++++++++ .../resources/mapper/functionUtils/Function.xml | 2 +- .../templates/pda/transferWarehousing2.ftl | 4 ++-- .../pda/transferWarehousing2ForHunlian.ftl | 4 ++-- 7 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/heai/modules/production/entity/CardPrintData.java diff --git a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java index f0f6f86..b706d06 100644 --- a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java +++ b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java @@ -795,4 +795,19 @@ public class DailyPlanController { dailyPlanService.cancelSfdc(inData); return R.ok(); } + + /** + * @Description 混炼大卡打印 + * @Title getHunLianPrintData + * @param inData + * @author rq + * @date 2022/10/25 18:16 + * @return R + * @throw + */ + @PostMapping("/getHunLianPrintData") + public R getHunLianPrintData(@RequestBody CardPrintData inData){ + List> result= dailyPlanService.getHunLianPrintData(inData); + return R.ok().put("rows",result); + } } diff --git a/src/main/java/com/heai/modules/production/entity/CardPrintData.java b/src/main/java/com/heai/modules/production/entity/CardPrintData.java new file mode 100644 index 0000000..6d4b669 --- /dev/null +++ b/src/main/java/com/heai/modules/production/entity/CardPrintData.java @@ -0,0 +1,11 @@ +package com.heai.modules.production.entity; + +import lombok.Data; + +@Data +public class CardPrintData { + private String site; + private String taskNo; + private String partNo; + private String createDate; +} diff --git a/src/main/java/com/heai/modules/production/service/DailyPlanService.java b/src/main/java/com/heai/modules/production/service/DailyPlanService.java index f9b1bc3..a09b5f1 100644 --- a/src/main/java/com/heai/modules/production/service/DailyPlanService.java +++ b/src/main/java/com/heai/modules/production/service/DailyPlanService.java @@ -595,4 +595,15 @@ public interface DailyPlanService { * @throw */ void cancelSfdc(SfdcCancel inData); + + /** + * @Description 取消报工信息 + * @Title CardPrintData + * @param inData + * @author rq + * @date 2022/10/31 17:43 + * @return void + * @throw + */ + List> getHunLianPrintData(CardPrintData inData); } diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java index 0775bc9..0b55ca0 100644 --- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java +++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java @@ -1124,4 +1124,19 @@ public class DailyPlanServiceImpl implements DailyPlanService { throw new RuntimeException(String.valueOf(map.get("resultMsg"))); } } + + @Override + public List> getHunLianPrintData(CardPrintData inData){ + List params = new ArrayList<>(); + + params.add(inData.getSite()); + + params.add(inData.getTaskNo()); + + params.add(inData.getPartNo()); + + params.add(inData.getCreateDate()); + List> resultList = functionMapper.getProcedureData("sfdc_cancelsfdc", params); + return resultList; + } } diff --git a/src/main/resources/mapper/functionUtils/Function.xml b/src/main/resources/mapper/functionUtils/Function.xml index d000fae..216b31e 100644 --- a/src/main/resources/mapper/functionUtils/Function.xml +++ b/src/main/resources/mapper/functionUtils/Function.xml @@ -55,6 +55,6 @@ - update Hunlian_TaskHeader set WareHouseFlag='Y' ,WareHouseQty=#{reportQty} where site=#{site} and taskNo=#{transNo} + update Hunlian_TaskHeader set WareHouseFlag='Y' ,WareHouseQty=#{reportQty} where site=#{site} and taskNo=#{taskNo} \ No newline at end of file diff --git a/src/main/resources/templates/pda/transferWarehousing2.ftl b/src/main/resources/templates/pda/transferWarehousing2.ftl index 3d8d26f..362ccd4 100644 --- a/src/main/resources/templates/pda/transferWarehousing2.ftl +++ b/src/main/resources/templates/pda/transferWarehousing2.ftl @@ -133,8 +133,8 @@
- - + +
diff --git a/src/main/resources/templates/pda/transferWarehousing2ForHunlian.ftl b/src/main/resources/templates/pda/transferWarehousing2ForHunlian.ftl index 4e31667..62d76d7 100644 --- a/src/main/resources/templates/pda/transferWarehousing2ForHunlian.ftl +++ b/src/main/resources/templates/pda/transferWarehousing2ForHunlian.ftl @@ -135,8 +135,8 @@
- - + + <#-- -->