From 2086c976dd68e49631520c2d03064d387a0d3cff Mon Sep 17 00:00:00 2001 From: 16358 <1635849544@qq.com> Date: Fri, 13 Jun 2025 14:44:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=9F=E7=A9=BA=E5=AF=B9=E6=8E=A5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PoundappliServiceImpl.java | 1 - .../main/java/com/ruoyi/webApi/ApiTask.java | 78 +++++++++- .../measurement/bill/PoundappliMapper.xml | 145 +++++++++--------- .../system/SysConfigController.java | 7 + 4 files changed, 150 insertions(+), 81 deletions(-) diff --git a/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundappliServiceImpl.java b/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundappliServiceImpl.java index 3a1a137..4992645 100644 --- a/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundappliServiceImpl.java +++ b/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundappliServiceImpl.java @@ -54,7 +54,6 @@ public class PoundappliServiceImpl extends ServiceImpl数据 - public void makePoundAppliFormData(String formid){ + /** + * 保存星空数据为中台<过磅申请>数据 + * @param formid 星空单据id + * @param oaData 星空数据 + */ + public void makePoundAppliFormData(String formid,String oaData){ + // 1. 将 oaData 解析为 JSONArray（二维数组） + JSONArray dataList = JSONArray.parseArray(oaData); + // 2. 遍历每一行数据 + for (int i = 0; i < dataList.size(); i++) { + JSONArray row = dataList.getJSONArray(i); + String dateStr = row.getString(0); // 申请日期 + DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME; + LocalDateTime localDateTime = LocalDateTime.parse(dateStr, formatter); + Date date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()); + String billNo = row.getString(1); // 申请单号 + String carno = row.getString(2); // 车号 + String company = row.getString(3); // 发货单位 + String materialName = row.getString(4); // 物料名称 + String specification = row.getString(5); // 物料规格 + Double weight = row.getDouble(6); // 计划重量 +// Double F_JLHCSL = row.getDouble(7); // 计划回传重量（中台回传） +// String F_YMZ = row.getString(8); // 原毛重（中台回传） +// String F_YPZ = row.getString(9); // 原皮重（中台回传） +// Integer F_JS = row.getInteger(10); // 件数（中台回传） +// Integer F_GMSHDW = row.getInteger(11); // 国贸收货单位（中台回传） +// Integer F_CYDW = row.getInteger(12); // 承运单位（中台回传） +// Integer F_BDMC = row.getInteger(13); // 磅点名称（中台回传） + String materialNumber = row.getString(14); // 物料编码 + String fid = row.getString(15); // 单据头内码 + String fentryid = row.getString(16); // 单据体内码 + String sourceBillNo = row.getString(17); // 来源单号 + + // 3. 保存过磅申请 + Poundappli poundappli = new Poundappli(); + poundappli.setBsndt(date); + poundappli.setUsrcode(billNo); + poundappli.setCarno(carno); + poundappli.setSendunitid(Long.valueOf(company)); + poundappli.setItmname(materialName); + poundappli.setSpecification(specification); + poundappli.setSrccleanmqty(new BigDecimal(weight)); + poundappli.setItmno(materialNumber); + poundappli.setFid(fid); + poundappli.setFentity_fentryid(fentryid); + poundappli.setSrcbillusrcode(sourceBillNo); + poundappli.setOabilltype(formid);//星空单据类型 + poundappli.setSrcbilltype("发货通知单");//来源单据类型 + poundappliService.insertPoundappli(poundappli); + } } - //保存星空数据为中台<主榜单>数据 - public void makeMainPoundFormData(String formid){ + /**保存星空数据为中台<主榜单>数据 + * @param formid 星空单据id + * @param oaData 星空数据 + */ + public void makeMainPoundFormData(String formid,String oaData){ } diff --git a/measurement/src/main/resources/mapper/measurement/bill/PoundappliMapper.xml b/measurement/src/main/resources/mapper/measurement/bill/PoundappliMapper.xml index 978f933..86d0717 100644 --- a/measurement/src/main/resources/mapper/measurement/bill/PoundappliMapper.xml +++ b/measurement/src/main/resources/mapper/measurement/bill/PoundappliMapper.xml @@ -90,78 +90,79 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into t_data_poundappli - - id, - bllstate, - usrcode, - bsndt, - carno, - itmname, - specification, - sendunitid, - sendunitname, - recentname, - trnentname, - srcpunbll, - srcwghmqty, - srcempmqty, - srccleanmqty, - srcbsndt, - msrunit, - msrname, - itmno, - cardriver, - poundid, - poundname, - srcbillusrcode, - crtorgid, - isinuse, - crtdt, - crtopr, - lstedtdt, - lstedtopr, - fid, - fentity_fentryid, - oabilltype, - remark, - - - #{id}, - #{bllstate}, - #{usrcode}, - #{bsndt}, - #{carno}, - #{itmname}, - #{specification}, - #{sendunitid}, - #{sendunitname}, - #{recentname}, - #{trnentname}, - #{srcpunbll}, - #{srcwghmqty}, - #{srcempmqty}, - #{srccleanmqty}, - #{srcbsndt}, - #{msrunit}, - #{msrname}, - #{itmno}, - #{cardriver}, - #{poundid}, - #{poundname}, - #{srcbillusrcode}, - #{crtorgid}, - #{isinuse}, - #{crtdt}, - #{crtopr}, - #{lstedtdt}, - #{lstedtopr}, - #{fid}, - #{fentity_fentryid}, - #{oabilltype}, - #{remark}, - - + INSERT INTO t_data_poundappli + + id, + bllstate, + usrcode, + bsndt, + carno, + itmname, + specification, + sendunitid, + sendunitname, + recentname, + trnentname, + srcpunbll, + srcwghmqty, + srcempmqty, + srccleanmqty, + srcbsndt, + msrunit, + msrname, + itmno, + cardriver, + poundid, + poundname, + srcbillusrcode, + crtorgid, + isinuse, + crtdt, + crtopr, + lstedtdt, + lstedtopr, + fid, + fentity_fentryid, + oabilltype, + remark, + + + #{id},NULL, + #{bllstate},NULL, + #{usrcode},NULL, + #{bsndt},NULL, + #{carno},NULL, + #{itmname},NULL, + #{specification},NULL, + #{sendunitid},NULL, + #{sendunitname},NULL, + #{recentname},NULL, + #{trnentname},NULL, + #{srcpunbll},NULL, + #{srcwghmqty},NULL, + #{srcempmqty},NULL, + #{srccleanmqty},NULL, + #{srcbsndt},NULL, + #{msrunit},NULL, + #{msrname},NULL, + #{itmno},NULL, + #{cardriver},NULL, + #{poundid},NULL, + #{poundname},NULL, + #{srcbillusrcode},NULL, + #{crtorgid},NULL, + #{isinuse},NULL, + #{crtdt},NULL, + #{crtopr},NULL, + #{lstedtdt},NULL, + #{lstedtopr},NULL, + #{fid},NULL, + #{fentity_fentryid},NULL, + #{oabilltype},NULL, + #{remark},NULL, + + + update t_data_poundappli diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java index ab4653d..4a91038 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java @@ -21,6 +21,7 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.service.ISysConfigService; +import org.springframework.web.util.HtmlUtils; /** * 参数配置 信息操作处理 @@ -87,6 +88,9 @@ public class SysConfigController extends BaseController { return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在"); } + // 解码 configValue 中的 HTML 实体（如 > -> >） + if (config.getConfigValue() != null) config.setConfigValue(HtmlUtils.htmlUnescape(config.getConfigValue())); + config.setCreateBy(getUsername()); return toAjax(configService.insertConfig(config)); } @@ -103,6 +107,9 @@ public class SysConfigController extends BaseController { return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在"); } + // 解码 configValue 中的 HTML 实体（如 > -> >） + if (config.getConfigValue() != null) config.setConfigValue(HtmlUtils.htmlUnescape(config.getConfigValue())); + config.setUpdateBy(getUsername()); return toAjax(configService.updateConfig(config)); }