Skip to content

T
topsun-bpm
Commit f28912ae authored by 1650842865's avatar 1650842865
Browse files
Options

工序外协报价增加包装费；工序外协打印预览调整；采购信息记录增加复制

parent ee4be431
Hide whitespace changes
Inline Side-by-side
Showing with 427 additions and 95 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/materialApplyNext.jsp
View file @ f28912ae
......@@ -86,13 +86,7 @@
<x:title title="物品总体内容" name="group"/>
<div class="hg-form-cols" id="totalContentDiv">
<div class="hg-form-row">
<x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="2"/>
<%-- <c:if test="${kind=='product'}">--%>
<%-- <x:inputC name="applicableStandard" label="适用标准(国标)" labelCol="1" fieldCol="2"/>--%>
<%-- </c:if>--%>
<%-- <c:if test="${kind!='product'}">--%>
<%-- <x:inputC name="applicableStandard" label="适用行业标准" labelCol="1" fieldCol="2"/>--%>
<%-- </c:if>--%>
<x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="5"/>
<x:inputC name="applicableStandard" label="适用行业标准" labelCol="1" fieldCol="2"/>
<x:hidden name="baseUnit"/>
<x:inputC name="baseUnitName" label="基本计量单位" labelCol="1" fieldCol="2" readonly="true"/>
......@@ -102,7 +96,7 @@
<x:inputC name="size" label="尺码" labelCol="1" fieldCol="2"/>
<x:inputC name="brand" label="品牌" labelCol="1" fieldCol="2"/>
<x:selectC name="itemAttributes" label="物品属性" labelCol="1" fieldCol="2" dictionary="suppliesType"/>
<x:inputC name="materialUsage" label="用途" labelCol="1" fieldCol="8"/>
<x:inputC name="materialUsage" label="用途" labelCol="1" fieldCol="5"/>
</div>
<div class="hg-form-row">
......@@ -130,7 +124,7 @@
<x:hidden name="spart"/>
<%--<x:selectC name="mtposMara" label="项目类别组" labelCol="1" fieldCol="2" dictionary="mtposMara"/>--%>
<x:hidden name="mtposMara"/>
<x:inputC name="maktx" label="汉语品名" required="true" labelCol="1" fieldCol="2"/>
<x:inputC name="maktx" label="汉语品名" required="true" labelCol="1" fieldCol="5"/>
<x:hidden name="xchpf"/>
<!--x:inputC name="magrv" label="包装物料组" labelCol="1" fieldCol="2"/-->
......@@ -151,7 +145,7 @@
<x:hidden name="gewei" />
<%-- <x:inputC name="volum" label="体积" labelCol="1" fieldCol="2"/>--%>
<%-- <x:selectC name="voleh" label="体积单位" labelCol="1" fieldCol="2" dictionary="voleh"/>--%>
<!--x:inputC name="iprkz" label="有效时间标识" labelCol="1" fieldCol="2"/-->
<%--<x:inputC name="iprkz" label="有效时间标识" labelCol="1" fieldCol="2"/>--%>
<x:hidden name="iprkz"/>
<%--<x:selectC name="iprkz" label="有效时间标识" required="false" labelCol="1" fieldCol="2" dictionary="iprkz"/>--%>
<x:inputC name="mhdhb" label="总有效期" labelCol="1" fieldCol="2"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp
View file @ f28912ae
......@@ -84,7 +84,7 @@
<x:title title="物品总体内容" name="group"/>
<div class="hg-form-cols" id="totalContentDiv">
<div class="hg-form-row">
<x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="2"/>
<x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="5"/>
<%-- <c:if test="${kind=='product'}">--%>
<%-- <x:inputC name="applicableStandard" label="适用标准(国标)" labelCol="1" fieldCol="2"/>--%>
<%-- </c:if>--%>
......@@ -100,7 +100,7 @@
<x:inputC name="size" label="尺码" labelCol="1" fieldCol="2"/>
<x:inputC name="brand" label="品牌" labelCol="1" fieldCol="2"/>
<x:selectC name="itemAttributes" label="物品属性" labelCol="1" fieldCol="2" dictionary="suppliesType"/>
<x:inputC name="materialUsage" label="用途" labelCol="1" fieldCol="8"/>
<x:inputC name="materialUsage" label="用途" labelCol="1" fieldCol="5"/>
</div>
<div class="hg-form-row">
......@@ -123,7 +123,7 @@
<x:inputC name="spartName" label="产品组" required="true" labelCol="1" fieldCol="2" wrapper="select"/>
<x:hidden name="spart"/>
<x:selectC name="mtposMara" label="项目类别组" labelCol="1" fieldCol="2" dictionary="mtposMara"/>
<x:inputC name="maktx" label="汉语品名" required="true" labelCol="1" fieldCol="2"/>
<x:inputC name="maktx" label="汉语品名" required="true" labelCol="1" fieldCol="5"/>
<x:selectC name="xchpf" label="批次管理" labelCol="1" fieldCol="2" dictionary="xchpf" required="true"/>
<!--x:inputC name="magrv" label="包装物料组" labelCol="1" fieldCol="2"/-->
......
topsun-xt/src/main/webapp/biz/topsun/sap/processQuotedPrice/processQuotedPriceDetail.js
View file @ f28912ae
......@@ -312,6 +312,7 @@ function loadClickItemGrid() {
{display: "含税单价", name: "unitPrice", width: 100, minWidth: 60, type: "String", align: "left"},
{display: "不含税单价", name: "excludeTaxPrice", width: 100, minWidth: 60, type: "String", align: "left"},
{display: "运输费", name: "freight", width: 100, minWidth: 60, type: "String", align: "left"},
{display: "包装费", name: "packMoney", width: 100, minWidth: 60, type: "String", align: "left"},
{display: "最低消费", name: "minimum", width: 100, minWidth: 60, type: "String", align: "left"},
{display: "loss数", name: "lossNumber", width: 100, minWidth: 60, type: "String", align: "left"},
],
......
topsun-xt/src/main/webapp/biz/topsun/sap/processQuotedPrice/processQuotedPriceList.js
View file @ f28912ae
......@@ -208,6 +208,8 @@ function showItemNumber(row,panel){
{display: "备注", name: "remark", width: 200, minWidth: 60, type: "String", align: "left"},
{display: "含税单价", name: "unitPrice", width: 100, minWidth: 60, type: "String", align: "left"},
{display: " 不含税单价", name: "excludeTaxPrice", width: 100, minWidth: 60, type: "String", align: "left"},
{display: "运输费", name: "freight", width: 100, minWidth: 60, type: "String", align: "left",},
{display: "包装费", name: "packMoney", width: 100, minWidth: 60, type: "String", align: "left",},
{display: "最低消费", name: "minimum", width: 100, minWidth: 60, type: "String", align: "left"},
{display: "loss数", name: "lossNumber", width: 100, minWidth: 60, type: "String", align: "left"},
],
......
topsun-xt/src/main/webapp/biz/topsun/sap/processQuotedPrice/processQuotedPriceNumber.js
View file @ f28912ae
......@@ -72,6 +72,12 @@ function loadItemNumberGrid() {
required: false, type: "text",mask: '9999999.999'
}
},
{
display: "包装费", name: "packMoney", width: 100, minWidth: 60, type: "String", align: "left",
editor: {
required: false, type: "text",mask: '9999999.999'
}
},
{
display: "最低消费", name: "minimum", width: 100, minWidth: 60, type: "String", align: "left",
editor: {
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordDetail.js
View file @ f28912ae
......@@ -52,6 +52,18 @@ function initItemGrid() {
}
});
},
copyHandler: {
id: 'copyHandler', text: '复制', img: 'fa-copy', click: function () {
var row = itemGridManager.getSelectedRow();
if (!row) {
Public.tip("请勾选一条数据");
return;
}
var newRow = JSON.parse(JSON.stringify(row));
newRow.id = null;
UICtrl.addGridRow(itemGridManager, newRow);
}
}
});
itemGridManager = UICtrl.grid('#maingrid', {
columns: getGridColumns(),
......
topsun-xt/src/main/webapp/template/print/topsun/processOuter.ftl
View file @ f28912ae
......@@ -96,22 +96,22 @@
</table>
<table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup>
<col width='10%'/>
<col width='15%'/>
<col width='10%'/>
<col width='30%'/>
<col width='10%'/>
<col width='8%'/>
<col width='10%'/>
<col width='8%'/>
<col width='6%'/>
<col width='33%'/>
<col width='8%'/>
<col width='8%'/>
<col width='8%'/>
<col width='8%'/>
<col width='4%'/>
<col width='5%'/>
</colgroup>
<tr>
<td class="center">产品编码</td>
<td class="center">${matnr2?default("")?html}</td>
<td class="center">产品名称</td>
<td class="center">${maktx?default("")?html}</td>
<td class="left">${maktx?default("")?html}</td>
<td class="center">成品数量</td>
<td class="center">${number?default("")?html}</td>
<td class="center">LOSS数</td>
......@@ -122,17 +122,17 @@
</table>
<table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup>
<col width='8%'/>
<col width='10%'/>
<col width='8%'/>
<col width='15%'/>
<col width='10%'/>
<col width='10%'/>
<col width='10%'/>
<col width='10%'/>
<col width='10%'/>
<col width='8%'/>
<col width='10%'/>
<col width='8%'/>
<col width='6%'/>
<col width='8%'/>
<col width='8%'/>
<col width='8%'/>
<col width='4%'/>
<col width='5%'/>
</colgroup>
<tr>
......@@ -152,24 +152,24 @@
</table>
<table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup>
<col width='10%'/>
<col width='35%'/>
<col width='10%'/>
<col width='10%'/>
<col width='10%'/>
<col width='8%'/>
<col width='33%'/>
<col width='8%'/>
<col width='10%'/>
<col width='8%'/>
<col width='6%'/>
<col width='8%'/>
<col width='8%'/>
<col width='8%'/>
<col width='4%'/>
<col width='5%'/>
</colgroup>
<tr>
<td class="center">外发工序</td>
<td class="center">${outProcess01?default("")?html}</td>
<td class="left">${outProcess01?default("")?html}</td>
<td class="center">下道工序</td>
<td class="center">${outProcess02?default("")?html}</td>
<td class="center">应回厂数量</td>
<td class="center">${number?default("")?html}</td>
<td class="center">${backNumber?default("")?html}</td>
<td class="center">实际送货数量</td>
<td class="center">${realNumber?default("")?html}</td>
<td class="center">单位</td>
......@@ -178,8 +178,34 @@
</table>
<table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup>
<col width='8%'/>
<col width='10%'/>
<col width='8%'/>
<col width='6%'/>
<col width='9%'/>
<col width='91%'/>
<col width='8%'/>
<col width='10%'/>
<col width='8%'/>
<col width='8%'/>
<col width='25%'/>
</colgroup>
<tr>
<td class="center">单价</td>
<td class="center">${netpr?default("")?html}</td>
<td class="center">运输费用</td>
<td class="center">${kbetr2?default("")?html}</td>
<td class="center">包装费用</td>
<td class="center">${kbetr3?default("")?html}</td>
<td class="center">合计单价</td>
<td class="center">${priceAmount?default("")?html}</td>
<td class="center">总额</td>
<td class="center">${amount?default("")?html}</td>
</tr>
</table>
<table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup>
<col width='8%'/>
<col width='92%'/>
</colgroup>
<tr>
<td class="center">生产制程</td>
......@@ -188,8 +214,8 @@
</table>
<table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup>
<col width='9%'/>
<col width="91%"/>
<col width='8%'/>
<col width="92%"/>
</colgroup>
<tr>
<td class="center">备注</td>
......@@ -199,77 +225,24 @@
<table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup>
<col width='20%' />
<col width='20%' />
<col width='20%' />
</colgroup>
<tr>
<td class="center" >生产单号</td>
<td class="center" >指令号</td>
<td class="center" >订单数</td>
</tr>
<#if saleOrderVos?? && saleOrderVos?size gt 0>
<#list saleOrderVos as detail>
<tr>
<td class="center">${detail.vbeln?default("")?html}</td>
<td class="center">${detail.zinstnum?default("")?html}</td>
<td class="center">${detail.kwmeng?default("")?html}</td>
</tr>
</#list>
<#else>
<tr>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
</tr>
</#if>
</table>
<#--<table cellspacing="0px" cellpadding="0px" class="tableBorder">-->
<#-- <colgroup>-->
<#-- <col width='9%'/>-->
<#-- <col width='91%'/>-->
<#-- </colgroup>-->
<#-- <tr>-->
<#-- <td class="center">加工费用（不含税）</td>-->
<#-- <td class="left">${used?default("")?html}</td>-->
<#-- </tr>-->
<#--</table>-->
<table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup>
<col width='10%'/>
<col width='10%'/>
<col width='10%'/>
<col width='10%'/>
<col width='10%'/>
<col width='10%'/>
<col width='10%'/>
<col width='10%'/>
<col width='10%'/>
<col width='10%'/>
</colgroup>
<tr>
<td class="center">单价</td>
<td class="center">${netpr?default("")?html}</td>
<td class="center">运输费用</td>
<td class="center">${kbetr2?default("")?html}</td>
<td class="center">包装费用</td>
<td class="center">${kbetr3?default("")?html}</td>
<td class="center">合计单价</td>
<td class="center">${priceAmount?default("")?html}</td>
<td class="center">总额</td>
<td class="center">${amount?default("")?html}</td>
</tr>
</table>
<#--<table cellspacing="0px" cellpadding="0px" class="tableBorder">-->
<#-- <colgroup>-->
<#-- <col width='9%'/>-->
<#-- <col width='91%'/>-->
<#-- </colgroup>-->
<#-- <tr>-->
<#-- <td class="center">生产单号</td>-->
<#-- <td class="left">${used?default("")?html}</td>-->
<#-- </tr>-->
<#--</table>-->
<table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup>
<col width='33%'/>
......
topsun-xt/src/main/webapp/template/print/topsun/productProcessOuter.ftl 0 → 100644
View file @ f28912ae
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<head>
<title>外发加工单</title>
<#include "/print/commonStyleTemplate.ftl" />
<style type="text/css">
td {
font-size: 12px;
}
</style>
</head>
<body>
<!-- 页眉部分 -->
<div style="font-size: 20px;text-align: center; margin-top: 0px">广州市宝绅科技应用有限公司</div>
<table cellspacing="0px" cellpadding="0px" class="tablePrint">
<colgroup>
<col width="40%"/>
<col width="10%"/>
<col width="40%"/>
</colgroup>
<tr>
<td class="right">电 话：020-36201957/020-36343128</td>
<td> </td>
<td class="left">地 址：广州市白云区江高小塘南路68号</td>
</tr>
</table>
<table cellspacing="0px" cellpadding="0px" class="tablePrint">
<colgroup>
<col width="40%"/>
<col width="10%"/>
<col width="40%"/>
</colgroup>
<tr>
<td class="right">传 真：020-36201902/020-36201962</td>
<td> </td>
<td class="left">E_Mail：gzbaoshen@gzbaoshen.com</td>
</tr>
</table>
<hr/>
<table cellspacing="0px" cellpadding="0px" class="tablePrint">
<colgroup>
<col width='60%'/>
<col width="40%"/>
</colgroup>
<tr>
<td style="font-size: 20px;text-align: right;margin-top: 0.5cm">外发加工单</td>
<td class="right">
<img class="barcode" src="${barCode}" style="right: auto"></img>
</td>
</tr>
</table>
<table cellspacing="0px" cellpadding="0px" class="tablePrint">
<colgroup>
<col width='70%'/>
</colgroup>
<tr>
<td class="left">加工商：${namel?default("")?html}</td>
</tr>
</table>
<table cellspacing="0px" cellpadding="0px" class="tablePrint">
<colgroup>
<col width='50%'/>
<col width="25%"/>
<col width="25%"/>
</colgroup>
<tr>
<td class="left">加工商地址：${address?default("")?html}</td>
<td class="left">□是否半成品</td>
<td class="left">仓库：${lgobe?default("")?html}</td>
</tr>
</table>
<table cellspacing="0px" cellpadding="0px" class="tablePrint">
<colgroup>
<col width='75%'/>
<col width="25%"/>
</colgroup>
<tr>
<td class="left">交货地点：${strSuppl?default("")?html}</td>
<td class="left">联系人电话：${telf1?default("")?html}</td>
</tr>
</table>
<table cellspacing="0px" cellpadding="0px" class="tablePrint">
<colgroup>
<col width='50%'/>
<col width="25%"/>
<col width="25%"/>
</colgroup>
<tr>
<td class="left"></td>
<td class="left">外发日期：<@formatDate date=fillinDate/></td>
<td class="left">交货日期：<@formatDate date=eindt/></td>
</tr>
</table>
<table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup>
<col width='8%'/>
<col width='10%'/>
<col width='8%'/>
<col width='33%'/>
<col width='8%'/>
<col width='8%'/>
<col width='8%'/>
<col width='8%'/>
<col width='4%'/>
<col width='5%'/>
</colgroup>
<tr>
<td class="center">产品编码</td>
<td class="center">${matnr2?default("")?html}</td>
<td class="center">产品名称</td>
<td class="left">${maktx?default("")?html}</td>
<td class="center">成品数量</td>
<td class="center">${number?default("")?html}</td>
<td class="center">LOSS数</td>
<td class="center">${loss?default("")?html}</td>
<td class="center">单位</td>
<td class="center">${msehl?default("")?html}</td>
</tr>
</table>
<table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup>
<col width='8%'/>
<col width='10%'/>
<col width='8%'/>
<col width='15%'/>
<col width='8%'/>
<col width='10%'/>
<col width='8%'/>
<col width='8%'/>
<col width='8%'/>
<col width='8%'/>
<col width='4%'/>
<col width='5%'/>
</colgroup>
<tr>
<td class="center">排版数量</td>
<td class="center">${model?default("")?html}</td>
<td class="center">印张规格</td>
<td class="center">${sheetSpecifications?default("")?html}</td>
<td class="center">印刷色数</td>
<td class="center">${printColor?default("")?html}</td>
<td class="center">印张量</td>
<td class="center">${printNumber?default("")?html}</td>
<td class="center">印张LOSS</td>
<td class="center">${printLoss?default("")?html}</td>
<td class="center">单位</td>
<td class="center">${msehl?default("")?html}</td>
</tr>
</table>
<table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup>
<col width='8%'/>
<col width='33%'/>
<col width='8%'/>
<col width='10%'/>
<col width='8%'/>
<col width='8%'/>
<col width='8%'/>
<col width='8%'/>
<col width='4%'/>
<col width='5%'/>
</colgroup>
<tr>
<td class="center">外发工序</td>
<td class="center">${outProcess01?default("")?html}</td>
<td class="center">下道工序</td>
<td class="center">${outProcess02?default("")?html}</td>
<td class="center">应回厂数量</td>
<td class="center">${backNumber?default("")?html}</td>
<td class="center">实际送货数量</td>
<td class="center">${realNumber?default("")?html}</td>
<td class="center">单位</td>
<td class="center">${msehl?default("")?html}</td>
</tr>
</table>
<table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup>
<col width='8%'/>
<col width='10%'/>
<col width='8%'/>
<col width='6%'/>
<col width='9%'/>
<col width='8%'/>
<col width='10%'/>
<col width='8%'/>
<col width='8%'/>
<col width='25%'/>
</colgroup>
<tr>
<td class="center">单价</td>
<td class="center">${netpr?default("")?html}</td>
<td class="center">运输费用</td>
<td class="center">${kbetr2?default("")?html}</td>
<td class="center">包装费用</td>
<td class="center">${kbetr3?default("")?html}</td>
<td class="center">合计单价</td>
<td class="center">${priceAmount?default("")?html}</td>
<td class="center">总额</td>
<td class="center">${amount?default("")?html}</td>
</tr>
</table>
<table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup>
<col width='8%'/>
<col width='92%'/>
</colgroup>
<tr>
<td class="center">生产制程</td>
<td class="left">${productionProcess?default("")?html}</td>
</tr>
</table>
<table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup>
<col width='8%'/>
<col width='92%'/>
</colgroup>
<tr>
<td class="center">备注</td>
<td class="left" style="height: 80px"></td>
</tr>
</table>
<table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup>
<col width='20%' />
<col width='20%' />
<col width='20%' />
</colgroup>
<tr>
<td class="center" >生产单号</td>
<td class="center" >指令号</td>
<td class="center" >订单数</td>
</tr>
<#if saleOrderVos?? && saleOrderVos?size gt 0>
<#list saleOrderVos as detail>
<tr>
<td class="center">${detail.vbeln?default("")?html}</td>
<td class="center">${detail.zinstnum?default("")?html}</td>
<td class="center">${detail.kwmeng?default("")?html}</td>
</tr>
</#list>
<#else>
<tr>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
<td class="center">&nbsp;</td>
</tr>
</#if>
</table>
<table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup>
<col width='33%'/>
<col width="33%"/>
<col width="33%"/>
</colgroup>
<tr>
<td class="left">产品正面图片：
<br/>
<img src='${frontImg?default("")?html}' width="230px"/>
</td>
<td class="left">产品背面图片：
<br/>
<img src='${backImg?default("")?html}' width="230px"/>
</td>
<td class="left">排版图片：</td>
</tr>
</table>
<#if materialList?? && materialList?size gt 0>
<table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup>
<col width='25%' />
<col width='25%' />
<col width='25%' />
<col width='25%' />
</colgroup>
<tr>
<td class="center" >供给物料名称</td>
<td class="center" >数量</td>
<td class="center" >计量单位</td>
<td class="center" >运输方式</td>
</tr>
<#list materialList as detail>
<tr>
<td class="center">${detail.materialName?default("")?html}</td>
<td class="center">${detail.num?default("")?html}</td>
<td class="center">${detail.unitName?default("")?html}</td>
<td class="center">${detail.deliveryMethodOut?default("")?html}</td>
</tr>
</#list>
</table>
<#else >
</#if>
<table cellspacing="0px" cellpadding="0px" class="tableBorder">
<colgroup>
<col width='100%' />
</colgroup>
<tr>
<td class="left">付款方式：${zwels?default("")?html}
<br/>
月结方式：${zterm?default("")?html}
<br/>
注意事项：整张订单结束后方可请款，送货和付款时请附上此单。收到订单请2小时内签回。周六，日不收货。周一至周五17:00下班。
</td>
</tr>
</table>
<table cellspacing="0px" cellpadding="0px" class="tablePrint">
<colgroup>
<col width='33%'/>
<col width="33%"/>
<col width="33%"/>
</colgroup>
<tr>
<td class="left">加工商回签：</td>
<td class="left">核准：</td>
<td class="left">采购员：${personMemberName?default("")?html}</td>
</tr>
</table>
</body>
</html>
topsun/src/main/java/com/huigou/topsun/sap/processQuotedPrice/domain/ProcessQuotedPriceItemNumber.java
View file @ f28912ae
......@@ -77,4 +77,10 @@ public class ProcessQuotedPriceItemNumber extends AbstractEntity {
@Column(name = "loss_number")
private BigDecimal lossNumber;
/**
* 包装费
*/
@Column(name = "pack_money")
private BigDecimal packMoney;
}
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java
View file @ f28912ae
......@@ -456,10 +456,13 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
//获取产品信息
map = this.getProductInfo(map);
//成品外购
map.put("page","/print/topsun/productProcessOuter.ftl");
//订单类型是ZNB3时对应工序外发（临时工序外协）
if ("ZNB3".equals(sapPurchaseOrder.getBsart())){
map = this.getProcessOutInfo(map);
//工序外协
map.put("page","/print/topsun/processOuter.ftl");
}
return map;
}
......@@ -509,6 +512,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
public Map<String, Object> getSaleOrderInfo(Map<String, Object> map,String orderId){
List<SapPurchaseOrderItem> purchaseOrderItems = this.sapPurchaseOrderItemApplication.getPurchaseOrderItems(orderId);
SapPurchaseOrderItem purchaseOrderItem = purchaseOrderItems.get(0);
purchaseOrderItem.setMatnr2(purchaseOrderItem.getMatnr2().replaceFirst("^0*", ""));
BeanUtil.beanToMap(purchaseOrderItem,map,false,false);
// map.put("eindt",purchaseOrderItem.getEindt());//交货日期
// map.put("lgobe",purchaseOrderItem.getLgobe());//仓库
......@@ -530,6 +534,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
zero = zero.add(saleOrderVo.getKwmeng());
}
map.put("number",zero);
map.put("backNumber",zero);
map.put("saleOrderVos",saleOrderVos);
//计算总额 = （含税单价+运输费）* 成品数量
BigDecimal netpr = purchaseOrderItem.getNetpr();//含税单价
......@@ -592,6 +597,10 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
printNumber = new BigDecimal(l);
}
map.put("printNumber",printNumber);
if (printNumber.compareTo(BigDecimal.ZERO) > 0){
//有成品数量+排版数量的时候，应回厂数量=印张量
map.put("backNumber",printNumber);
}
//LOSS数 = 印张LOSS * 排版数量
BigDecimal loss = printLoss.multiply(model);
......@@ -612,8 +621,14 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
ProcessQuotedPriceItemNumber quotedPriceItemNumber = processQuotedPriceItemApplication.findQuotedPriceByProductAndProcess(outsourceOrderItem.getProductCode(), outsourceOrderItem.getWempf(), outsourceOrderItem.getMenge(), outsourceOrderItem.getLifnr());
map.put("netpr",quotedPriceItemNumber.getUnitPrice());//含税单价
map.put("kbetr2",quotedPriceItemNumber.getFreight());//运输费
map.put("kbetr3","");//包装费
BigDecimal priceAmount = quotedPriceItemNumber.getUnitPrice().add(quotedPriceItemNumber.getFreight());
map.put("kbetr3",quotedPriceItemNumber.getPackMoney());//包装费
BigDecimal priceAmount = quotedPriceItemNumber.getUnitPrice();
if (quotedPriceItemNumber.getFreight() != null){
priceAmount = priceAmount.add(quotedPriceItemNumber.getFreight());
}
if (quotedPriceItemNumber.getPackMoney() != null){
priceAmount = priceAmount.add(quotedPriceItemNumber.getPackMoney());
}
map.put("priceAmount",priceAmount);//合计单价
map.put("amount",priceAmount.multiply(number));//总价
return map;
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/controller/SapPurchaseOrderController.java
View file @ f28912ae
......@@ -105,7 +105,7 @@ public class SapPurchaseOrderController extends CommonController {
SDO sdo = this.getSDO();
String id = sdo.getId();
Map<String,Object> map = this.sapPurchaseOrderApplication.print(id);
String pintPage = String.format("/print/topsun/processOuter.ftl");
String pintPage = String.format((String) map.get("page"));
return outputAndProcUnitHandlerPDF(pintPage, id, map);
}
......
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