Skip to content

T
topsun-bpm
Commit c44552ed authored by 鲁鑫's avatar 鲁鑫
Browse files
Options

成品外购打印时，供应商模糊匹配；ECN打印根据产品编码查询产品信息接口传输字段变更

parent 51d00046
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDetail.js
View file @ c44552ed
...@@ -49,8 +49,6 @@ function initialize(){ ...@@ -49,8 +49,6 @@ function initialize(){
} }
$('input[name="isAll"]').change(function () { $('input[name="isAll"]').change(function () {
//alert($(this).is(':checked'));
debugger
if ($(this).is(':checked')) { //alert("全选"); if ($(this).is(':checked')) { //alert("全选");
// $("#busiLens").val(dictUsage.length); // $("#busiLens").val(dictUsage.length);
for (var x=0;x<$("input[name='businessUsage']").length;x++) { for (var x=0;x<$("input[name='businessUsage']").length;x++) {
......
topsun-xt/src/main/webapp/template/print/topsun/epChangeForm.ftl
View file @ c44552ed
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
font-size: 13px; font-size: 13px;
} }
@page :first{ @page :first{
margin-top: 1.8cm; margin-top: 3.5cm;
} }
@page { @page {
size: A4; size: A4;
margin-top: 1.9cm; margin-top: 3.6cm;
@top-center { @top-center {
content: element(header); content: element(header);
} }
...@@ -24,23 +24,27 @@ ...@@ -24,23 +24,27 @@
<body> <body>
<!-- 页眉部分 --> <!-- 页眉部分 -->
<div style="position: running(header);" id="header"> <div style="position: running(header);" id="header">
<div class="billTitle" style="font-size: 25px"> <span style="position: absolute;margin-left: 40px;margin-top: 0.8cm">
<span style="position: absolute;margin-left: 70px"> <img src='data:image/jpg;base64,${bsnPng}' width="150px"/>
<img src='data:image/jpg;base64,${bsnPng}' width="100px"/>
</span> </span>
宝绅内部变更申请/通知单</div> <div class="billTitle" style="font-size: 25px;margin-top: 1.5cm">
宝绅内部变更申请/通知单
</div>
<div class="billTitle" style="font-size: 25px">
Engineering Change Notice
</div>
<table cellspacing="0px" cellpadding="0px" class="tablePrint"> <table cellspacing="0px" cellpadding="0px" class="tablePrint">
<colgroup> <colgroup>
<col width="20%"/> <col width="73%"/>
<col width="52%"/> <#--<col width="52%"/>-->
<col width="28%"/> <col width="27%"/>
</colgroup> </colgroup>
<tr> <tr>
<td class="left" style="font-size: 14px;font-weight:bold;">${changeNo?default("")?html}</td> <td class="left" style="font-size: 14px;font-weight:bold;">${changeNo?default("")?html}</td>
<td class="right"> <#-- <td class="right">-->
<div style="text-align:right;font-weight:bold;font-size: 25px">Engineering Change Notice</div> <#-- <div style="text-align:right;font-weight:bold;font-size: 25px">Engineering Change Notice</div>-->
</td> <#-- </td>-->
<td class="right" style="font-size: 14px;font-weight:bold;">变更编号：${billCode?default("")?html}</td> <td class="left" style="font-size: 14px;font-weight:bold;">变更编号：${billCode?default("")?html}</td>
</tr> </tr>
</table> </table>
</div> </div>
...@@ -48,8 +52,8 @@ ...@@ -48,8 +52,8 @@
<table class="tableBorder"> <table class="tableBorder">
<colgroup> <colgroup>
<col width='14%' /> <col width='14%' />
<col width='33%' /> <col width='37%' />
<col width='51%' /> <col width='49%' />
</colgroup> </colgroup>
<tr> <tr>
<td class="left">DATE日期:<br/><@formatDate date=fillinDate/></td> <td class="left">DATE日期:<br/><@formatDate date=fillinDate/></td>
...@@ -67,7 +71,7 @@ ...@@ -67,7 +71,7 @@
${reasonForChange?replace("nbsp", "&nbsp;&nbsp;&nbsp;&nbsp;")!default("")?html} ${reasonForChange?replace("nbsp", "&nbsp;&nbsp;&nbsp;&nbsp;")!default("")?html}
<br/> <br/>
${reasonForChange2?replace("nbsp", "&nbsp;&nbsp;&nbsp;&nbsp;")!default("")?html} ${reasonForChange2?replace("nbsp", "&nbsp;&nbsp;&nbsp;&nbsp;")!default("")?html}
<span style="text-decoration: underline">其他：${otherReasonDesc?default("")?html}</span> <span style="text-decoration: underline"> ${otherReasonDesc?default("")?html}</span>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -147,8 +151,8 @@ ...@@ -147,8 +151,8 @@
<table class="tableBorder"> <table class="tableBorder">
<colgroup> <colgroup>
<col width='22%' /> <col width='22%' />
<col width='25%' /> <col width='29%' />
<col width='50%' /> <col width='49%' />
</colgroup> </colgroup>
<tr> <tr>
<td class="center" style="background: yellow">审批节点</td> <td class="center" style="background: yellow">审批节点</td>
...@@ -176,9 +180,9 @@ ...@@ -176,9 +180,9 @@
<colgroup> <colgroup>
<col width='14%' /> <col width='14%' />
<col width='25%' /> <col width='25%' />
<col width='10%' />
<col width='12%' /> <col width='12%' />
<col width='39%' /> <col width='12%' />
<col width='37%' />
</colgroup> </colgroup>
<tr> <tr>
<td class="center" style="background: yellow">部门</td> <td class="center" style="background: yellow">部门</td>
...@@ -213,9 +217,9 @@ ...@@ -213,9 +217,9 @@
<colgroup> <colgroup>
<col width='14%' /> <col width='14%' />
<col width='25%' /> <col width='25%' />
<col width='10%' />
<col width='12%' /> <col width='12%' />
<col width='39%' /> <col width='12%' />
<col width='37%' />
</colgroup> </colgroup>
<tr> <tr>
<td class="center" style="background: yellow">部门</td> <td class="center" style="background: yellow">部门</td>
......
topsun/src/main/java/com/huigou/topsun/ep/epApplication/impl/EpApplicationImpl.java
View file @ c44552ed
...@@ -98,7 +98,7 @@ public class EpApplicationImpl implements EpApplication { ...@@ -98,7 +98,7 @@ public class EpApplicationImpl implements EpApplication {
EpProductInfoVo epProductInfoVo = new EpProductInfoVo(); EpProductInfoVo epProductInfoVo = new EpProductInfoVo();
try { try {
///api/pro/productionSolution/getPicture?groupCounter=02&groupKey=50000407 ///api/pro/productionSolution/getPicture?groupCounter=02&groupKey=50000407
String executeForEp = httpClient.executeForEp(new HashMap<>(), "md/mdItem/getUrl?itemCode="+matnr2); String executeForEp = httpClient.executeForEp(new HashMap<>(), "md/mdItem/getUrl?sapItemCode="+matnr2);
Map<String, Object> resultMap = JSONObject.parseObject(executeForEp, Map.class); Map<String, Object> resultMap = JSONObject.parseObject(executeForEp, Map.class);
if ("200".equals(resultMap.get("code").toString())) { if ("200".equals(resultMap.get("code").toString())) {
ObjectMapper objectMapper = SAPUtils.objectMapper(); ObjectMapper objectMapper = SAPUtils.objectMapper();
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java
View file @ c44552ed
...@@ -460,6 +460,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu ...@@ -460,6 +460,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
} }
public Map<String, Object> getSupplierInfo(Map<String, Object> map, String lifnr){ public Map<String, Object> getSupplierInfo(Map<String, Object> map, String lifnr){
lifnr = lifnr.replaceFirst("^0*", "");
List<SuppliersInfo> suppliersInfoList = suppliersInfoRepository.findByPartner(lifnr); List<SuppliersInfo> suppliersInfoList = suppliersInfoRepository.findByPartner(lifnr);
if (CollectionUtils.isEmpty(suppliersInfoList)){ if (CollectionUtils.isEmpty(suppliersInfoList)){
throw new RuntimeException("根据编码：" + lifnr + "未找到供应商信息"); throw new RuntimeException("根据编码：" + lifnr + "未找到供应商信息");
...@@ -537,9 +538,6 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu ...@@ -537,9 +538,6 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
EpProductInfoVo epProductInfoVo = epApplication.queryEpProductInfo(matnr2); EpProductInfoVo epProductInfoVo = epApplication.queryEpProductInfo(matnr2);
epProductInfoVo.setPrintColor(epProductInfoVo.getFrontColor()+";"+epProductInfoVo.getOppositeColor()); epProductInfoVo.setPrintColor(epProductInfoVo.getFrontColor()+";"+epProductInfoVo.getOppositeColor());
BeanUtil.beanToMap(epProductInfoVo,map,false,false); BeanUtil.beanToMap(epProductInfoVo,map,false,false);
// String imageUrl = "http://192.168.3.91:9000/mes/2024/10/15/20241015164918998370277.png";
// map.put("frontImg",imageUrl);
// map.put("backImg",imageUrl);
try { try {
File file = new File("product-"+map.get("ebeln")+".png"); File file = new File("product-"+map.get("ebeln")+".png");
if(!file.exists()) { if(!file.exists()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment