From 409881582d6b3427bcefb5227052abca71ccf364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Thu, 23 Apr 2026 20:28:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erpdata/feign/IErpDataProduceClient.java | 6 ++++-- .../feign/IErpDataProduceClientFallback.java | 2 +- .../service/impl/HandoverRecordServiceImpl.java | 2 +- .../erpdata/feign/ErpDataProduceClient.java | 2 +- .../erpdata/service/IErpDataProduceService.java | 3 ++- .../service/impl/ErpDataProduceServiceImpl.java | 14 ++++++++++++-- 6 files changed, 21 insertions(+), 8 deletions(-) diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java index febafc04..0edf8a0a 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClient.java @@ -1,6 +1,7 @@ package org.springblade.erpdata.feign; +import com.alibaba.excel.annotation.format.DateTimeFormat; import org.springblade.common.constant.LauncherConstant; import org.springblade.core.tool.api.R; import org.springblade.desk.produce.pojo.dto.MesRbRedoRoutDTO; @@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam; import java.util.Date; import java.util.List; +import java.util.Locale; import java.util.Map; /** @@ -205,9 +207,9 @@ public interface IErpDataProduceClient { */ @GetMapping(PRO_RBTRANSFERLEV) R proRbtransferlev(@RequestParam(value = "hrCode") String hrCode, @RequestParam(value = "ypCode") String ypCode, - @RequestParam(value = "woCode") String woCode, @RequestParam(value = "cardNo") String cardNo, + @RequestParam(value = "woCode") String woCode, @RequestParam(value = "cardNo", required = false) String cardNo, @RequestParam(value = "partCode") String partCode, @RequestParam(value = "batchNo") String batchNo, - @RequestParam(value = "createMan") String createMan, @RequestParam(value = "createTime") Date createTime, + @RequestParam(value = "createMan") String createMan, @RequestParam(value = "createTime") String createTime, @RequestParam(value = "handoverUnit", required = false) String handoverUnit, @RequestParam(value = "handoverQty") Integer handoverQty, @RequestParam(value = "recDept", required = false) String recDept, @RequestParam(value = "roamNo", required = false) String roamNo, @RequestParam(value = "deliverKey", required = false) String deliverKey, @RequestParam(value = "testQty") Integer testQty, diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClientFallback.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClientFallback.java index 3e1bbffe..da685eba 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClientFallback.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataProduceClientFallback.java @@ -115,7 +115,7 @@ public class IErpDataProduceClientFallback implements IErpDataProduceClient { } @Override - public R proRbtransferlev(String hrCode, String ypCode, String woCode, String cardNo, String partCode, String batchNo, String createMan, Date createTime, String handoverUnit, Integer handoverQty, String recDept, String roamNo, String deliverKey, Integer testQty, Integer lossQty, Integer scrapQty) { + public R proRbtransferlev(String hrCode, String ypCode, String woCode, String cardNo, String partCode, String batchNo, String createMan, String createTime, String handoverUnit, Integer handoverQty, String recDept, String roamNo, String deliverKey, Integer testQty, Integer lossQty, Integer scrapQty) { return R.fail("获取数据失败"); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/HandoverRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/HandoverRecordServiceImpl.java index bdad4999..4e1f443f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/HandoverRecordServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/HandoverRecordServiceImpl.java @@ -258,7 +258,7 @@ public class HandoverRecordServiceImpl extends BaseServiceImpl proRbtransferlev(String hrCode, String ypCode, String woCode, String cardNo, String partCode, String batchNo, String createMan, Date createTime, String handoverUnit, Integer handoverQty, String recDept, String roamNo, String deliverKey, Integer testQty, Integer lossQty, Integer scrapQty) { + public R proRbtransferlev(String hrCode, String ypCode, String woCode, String cardNo, String partCode, String batchNo, String createMan, String createTime, String handoverUnit, Integer handoverQty, String recDept, String roamNo, String deliverKey, Integer testQty, Integer lossQty, Integer scrapQty) { return R.data(erpDataProduceService.proRbtransferlev(hrCode, ypCode, woCode, cardNo, partCode, batchNo, createMan, createTime, handoverUnit, handoverQty, recDept, roamNo, deliverKey, testQty, lossQty, scrapQty)); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpDataProduceService.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpDataProduceService.java index 5d53d05e..ca301d58 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpDataProduceService.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/IErpDataProduceService.java @@ -3,6 +3,7 @@ package org.springblade.erpdata.service; import org.springblade.desk.produce.pojo.dto.MesRbRedoRoutDTO; import org.springblade.erpdata.pojo.vo.*; +import java.text.ParseException; import java.util.Date; import java.util.List; import java.util.Map; @@ -58,5 +59,5 @@ public interface IErpDataProduceService { ErpReturnDataVO proRbinviogen(String hrCode, String partCode, Integer handoverQty, String prodIdent, String batchNo, String ypCode, String woCode, String handoverUnit, String createMan, String recDept, String memo, String deliverKey, Integer testQty, Integer lossQty, Integer scrapQty); - ErpReturnDataVO proRbtransferlev(String hrCode, String ypCode, String woCode, String cardNo, String partCode, String batchNo, String createMan, Date createTime, String handoverUnit, Integer handoverQty, String recDept, String roamNo, String deliverKey, Integer testQty, Integer lossQty, Integer scrapQty); + ErpReturnDataVO proRbtransferlev(String hrCode, String ypCode, String woCode, String cardNo, String partCode, String batchNo, String createMan, String createTime, String handoverUnit, Integer handoverQty, String recDept, String roamNo, String deliverKey, Integer testQty, Integer lossQty, Integer scrapQty); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataProduceServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataProduceServiceImpl.java index 8b667b5f..664917a4 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataProduceServiceImpl.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpDataProduceServiceImpl.java @@ -15,6 +15,8 @@ import org.springframework.jdbc.core.simple.SimpleJdbcCall; import org.springframework.stereotype.Service; import java.sql.Types; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -31,6 +33,8 @@ public class ErpDataProduceServiceImpl implements IErpDataProduceService { private final JdbcTemplate jdbcTemplate; + private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + @Override public List queryBatch(String partCode) { return erpDataProduceMapper.queryBatch(partCode); @@ -401,7 +405,7 @@ public class ErpDataProduceServiceImpl implements IErpDataProduceService { } @Override - public ErpReturnDataVO proRbtransferlev(String hrCode, String ypCode, String woCode, String cardNo, String partCode, String batchNo, String createMan, Date createTime, String handoverUnit, Integer handoverQty, String recDept, String roamNo, String deliverKey, Integer testQty, Integer lossQty, Integer scrapQty) { + public ErpReturnDataVO proRbtransferlev(String hrCode, String ypCode, String woCode, String cardNo, String partCode, String batchNo, String createMan, String createTime, String handoverUnit, Integer handoverQty, String recDept, String roamNo, String deliverKey, Integer testQty, Integer lossQty, Integer scrapQty){ ErpReturnDataVO erpReturnDataVO = new ErpReturnDataVO(); SimpleJdbcCall jdbcCall = new SimpleJdbcCall(jdbcTemplate) // 指定存储过程名（包含 DB Link） @@ -430,6 +434,12 @@ public class ErpDataProduceServiceImpl implements IErpDataProduceService { new SqlOutParameter("v_excflag", Types.VARCHAR) ); // 2. 封装输入参数 + Date date = new Date(); + try { + date = sdf.parse(createTime); + } catch (ParseException e) { + log.error("时间转换错误", e); + } Map inParams = new HashMap<>(); inParams.put("v_hr_code", hrCode); inParams.put("v_po_code", ypCode); @@ -438,7 +448,7 @@ public class ErpDataProduceServiceImpl implements IErpDataProduceService { inParams.put("v_part_code", partCode); inParams.put("v_batch_no", batchNo); inParams.put("v_create_man", createMan); - inParams.put("v_create_time", createTime); + inParams.put("v_create_time", date); inParams.put("v_handover_unit", handoverUnit); inParams.put("v_handover_qty", handoverQty); inParams.put("v_rec_dept", recDept);