Skip to content

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

外协单打印优化；客供料维护仓库视图，取消存储条件必填；采购订单累计订单数量；工序外协选了报价后，不能编辑币别和税码

parent aa6ee641
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 34 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/materialApplyNext.js
View file @ 8f90f367
......@@ -58,8 +58,8 @@ function initializate() {
$("#xchpf").val("X");
$("#lgort").val("1099");
$("#lgortName").val("客供料专用库");
Public.tip("客供料不维护仓库管理视图和财务核算视图");
$("#businessUsageS").prop("checked",false);
Public.tip("客供料不维护财务核算视图");
//$("#businessUsageS").prop("checked",false);
$("#businessUsageB").prop("checked",false);
//分类类型、分类名称
......@@ -171,7 +171,7 @@ function initializate() {
$("#busiLens").val(dictUsage.length);
coRowNum=dictUsage.length;
for (var x=0;x<$("input[name='businessUsage']").length;x++) {
if (("1010" == $("#werks").val() || "ZGMB" == $("#mtart").val() || "ZKGL" == $("#mtart").val()) && x == 5){
if (("1010" == $("#werks").val() || "ZGMB" == $("#mtart").val() ) && x == 5){
$("input[name='businessUsage']")[x].checked = false;
}else if ("ZKGL" == $("#mtart").val() && x == 6){
$("input[name='businessUsage']")[x].checked = false;
......@@ -205,9 +205,9 @@ function initializate() {
if ($("#mtart").val() == "ZGMB"){
Public.tip("刀工模板具不维护仓库管理视图");
}
if ($("#mtart").val() == "ZKGL"){
Public.tip("客供料不维护仓库管理视图");
}
// if ($("#mtart").val() == "ZKGL"){
// Public.tip("客供料不维护仓库管理视图");
// }
}
if ("B"== $(this).val() ){
$("#businessUsageB").prop("checked",false);
......@@ -471,8 +471,8 @@ function bindEvent() {
Public.tip("刀工模板具不维护仓库管理视图");
$("#businessUsageS").prop("checked",false);
}else if (mtart == "ZKGL"){
Public.tip("客供料不维护仓库管理视图和财务核算视图");
$("#businessUsageS").prop("checked",false);
Public.tip("客供料不维护财务核算视图");
//$("#businessUsageS").prop("checked",false);
$("#businessUsageB").prop("checked",false);
} else {
//选择了工厂和库存地点后，带出存储条件
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
View file @ 8f90f367
......@@ -199,6 +199,10 @@ function initRaube(mtart) {
UICtrl.setElRequiredFlag("#raube",false);
UICtrl.setElRequiredFlag("#lgtypName",false);
}
if (mtart == "ZKGL"){
UICtrl.setElRequiredFlag("#raube",false);
}
}
function initSale(mtart){
......
topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/processOutsourceDetail.js
View file @ 8f90f367
......@@ -380,29 +380,29 @@ function getOrderColumns(){
},);
columns.push({
display: "币别", name: "waersTextView", width: 140, minWidth: 60, type: "string", align: "left",
editor: {
type: 'dictionary',
data: {name: 'waers'},
textField: 'waersTextView',
valueField: 'waers',
required: true,
render: function (item) {
return item.waersTextView;
}
},
// editor: {
// type: 'dictionary',
// data: {name: 'waers'},
// textField: 'waersTextView',
// valueField: 'waers',
// required: true,
// render: function (item) {
// return item.waersTextView;
// }
// },
},);
columns.push({
display: "税码", name: "purchaseMwskzTextView", width: 140, minWidth: 60, type: "string", align: "left",
editor: {
type: 'dictionary',
data: {name: 'purchaseMwskz'},
textField: 'purchaseMwskzTextView',
valueField: 'purchaseMwskz',
required: true,
render: function (item) {
return item.purchaseMwskzTextView;
}
},
// editor: {
// type: 'dictionary',
// data: {name: 'purchaseMwskz'},
// textField: 'purchaseMwskzTextView',
// valueField: 'purchaseMwskz',
// required: true,
// render: function (item) {
// return item.purchaseMwskzTextView;
// }
// },
});
}else {
columns.push({
......@@ -451,7 +451,7 @@ function loadMaterialGrid() {
materialGridManager = UICtrl.grid("#materialGrid", {
columns: [
{
display: "供给物品名称", name: "materialName", width: 300, minWidth: 60, type: "String", align: "left",
display: "供给物品名称", name: "materialName", width: 500, minWidth: 60, type: "String", align: "left",
editor: {type: 'text', required: true}
},
{
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderDetail.js
View file @ 8f90f367
......@@ -47,6 +47,7 @@ function initItemGrid() {
// fixedCellHeight: true,
onAfterShowData: function (){
initTotalMoney();
initTotalNum();
}
}
);
......@@ -103,6 +104,19 @@ function initTotalMoney(){
}
}
function initTotalNum(){
var _grid = UICtrl.getGridManager('#maingrid');
if (_grid != null){
var data = _grid.currentData.Rows;
var totalNum = 0;
$.each(data, function (i, o) {
var _menge = o['menge'] + '';
totalNum = MathUtil.add(totalNum, _menge);
$('#totalNum').val(totalNum);
});
}
}
function getId() {
return $('#id').val();
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderDetail.jsp
View file @ 8f90f367
......@@ -38,10 +38,10 @@
<x:inputC name="waers" label="币种" readonly="true" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="fillinDate" label="创建日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"
required="false"/>
<x:inputC name="totalMoney" label="订单总金额" readonly="true" labelCol="1" fieldCol="2"
required="false"/>
<x:inputC name="namel" label="供应商" readonly="true" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="headText" label="备注" readonly="true" labelCol="1" fieldCol="8" required="false"/>
<x:inputC name="totalMoney" label="订单总金额" readonly="true" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="totalNum" label="订单总数量" readonly="true" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="headText" label="备注" readonly="true" labelCol="1" fieldCol="5" required="false"/>
</div>
</div>
<div id="normal">
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java
View file @ 8f90f367
......@@ -679,10 +679,10 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
loss = loss.add(outsourceOrderItem.getPrintLoss() != null ? outsourceOrderItem.getPrintLoss() : BigDecimal.ZERO);//印张LOSS数改为LOSS数
//查询工序报价
ProcessQuotedPriceItemNumber quotedPriceItemNumber = processQuotedPriceItemApplication.findQuotedPriceByProductAndProcess(outsourceOrderItem.getProductCode(), outsourceOrderItem.getWempf(), outsourceOrderItem.getMenge(), outsourceOrderItem.getLifnr());
detailMap.put("netpr",quotedPriceItemNumber.getUnitPrice());//含税单价
detailMap.put("netpr",productKey.getKbetr());//含税单价
detailMap.put("kbetr2",quotedPriceItemNumber.getFreight());//运输费
detailMap.put("kbetr3",quotedPriceItemNumber.getPackMoney());//包装费
BigDecimal priceAmount = quotedPriceItemNumber.getUnitPrice();
BigDecimal priceAmount = productKey.getKbetr();
if (quotedPriceItemNumber.getFreight() != null){
priceAmount = priceAmount.add(quotedPriceItemNumber.getFreight());
}
......
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