Skip to content

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

供应商增加插叙条件；中心记帐冻结 ，集中设置的采购冻结 在创建的请自动带出 不需要显示 在修改或者变更才有这个显示；税号 设置必填

parent 77d6885a
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 39 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataDetail.js
View file @ c4e69eea
......@@ -24,6 +24,11 @@ function initialize(){
UICtrl.setDisable($("#submitForm"));
canEdit=false;
}
if (applyType == "0" || applyType=="-1" || applyType=="2"){
$("#frozenDiv").hide();
}else if (applyType == "1"){
$("#frozenDiv").show();
}
$('#supplierList').fileList({
bizId : $("#id").val()
});
......@@ -115,7 +120,7 @@ function loadSuppliersBuyerListGrid() {
toolbar: toolbarOptions,
enabledEdit: canEdit,
width: "98%",
height: "300px",
height: "200px",
heightDiff: -8,
checkbox: true,
fixedCellHeight: true,
......@@ -370,7 +375,7 @@ function loadSuppliersPayListGrid() {
toolbar: toolbarOptions,
enabledEdit: canEdit,
width: "98%",
height: "300px",
height: "200px",
heightDiff: -8,
checkbox: true,
fixedCellHeight: true,
......@@ -502,7 +507,7 @@ function loadSuppliersBankListGrid() {
toolbar: toolbarOptions,
enabledEdit: canEdit,
width: "98%",
height: "300px",
height: "200px",
heightDiff: -8,
checkbox: true,
fixedCellHeight: true,
......
topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataDetail.jsp
View file @ c4e69eea
......@@ -86,14 +86,15 @@
<!--x:selectC name="ktokk" label="供应商帐户组" labelCol="1" fieldCol="2" required="true" dictionary="buGroup"/-->
<x:inputC name="kunnr" label="客户编号" labelCol="1" fieldCol="2"/>
<%--<x:inputC name="vbund" label="贸易伙伴" labelCol="1" fieldCol="2"/>--%>
<x:inputC name="stenr" label="税号" labelCol="1" fieldCol="2" required="false" maxLength="18"/>
<x:selectC name="sperr" label="中心记帐冻结" labelCol="1" fieldCol="2" dictionary="sperr"/>
<x:selectC name="sperm" label="集中设置的采购冻结" labelCol="2" fieldCol="1" dictionary="sperrB"/>
<x:inputC name="stenr" label="税号" labelCol="1" fieldCol="2" required="true" maxLength="18"/>
<div id="frozenDiv">
<x:selectC name="sperr" label="中心记帐冻结" labelCol="1" fieldCol="2" dictionary="sperr"/>
<x:selectC name="sperm" label="集中设置的采购冻结" labelCol="2" fieldCol="1" dictionary="sperrB"/>
</div>
</div>
</div>
<div style="padding-top: 15px;">
<x:fileList bizCode="supplier" bizId="attbizId" id="supplierList" title="营业执照/开票资料" />
<x:fileList bizCode="supplier" bizId="id" id="supplierList" title="营业执照/开票资料" />
</div>
<div class="blank_div clearfix"></div>
<x:title title="供应商采购组织信息" name="group"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataList.js
View file @ c4e69eea
......@@ -78,6 +78,8 @@ function loadSuppliersDataListGrid() {
url: web_app.name + '/sapSuppliersData/slicedSuppliersDataList.ajax',
pageSize: 20,
usePager: true,
sortName: 'fillinDate',
sortOrder: 'desc',
toolbar: toolbarOptions,
width: "100%",
height: "100%",
......
topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataList.jsp
View file @ c4e69eea
......@@ -3,7 +3,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree"/>
<x:base include="layout,dialog,grid,tree,combox,commonTree,dateTime"/>
<x:script src='/biz/topsun/sap/suppliers/suppliersDataList.js'/>
</head>
<body>
......@@ -21,8 +21,12 @@
<x:inputC name="partner" required="false" label="业务伙伴编号" labelCol="1"/>
<x:inputC name="nameOrg1" required="false" label="组织名称1" labelCol="1"/>
<x:selectC name="applyType" label="操作类型" labelCol="1" fieldCol="2" dictionary="applyType"/>
<x:selectC name="buGroup" label="业务伙伴分组" labelCol="1" fieldCol="2" dictionary="buGroup"/>
<x:inputC name="personMemberName" label="申请人" labelCol="1" fieldCol="2"/>
<x:inputC name="fillinBeginDate" label="申请日期起" labelCol="1" fieldCol="2" wrapper="dateTime"/>
<x:inputC name="fillinEndDate" label="申请日期止" labelCol="1" fieldCol="2" wrapper="dateTime"/>
<x:checkboxListC name="statusKind" label="common.field.status" list="statusKindsList" labelCol="1" fieldCol="3"/>
<%--<x:selectC name="status" label="审批状态" labelCol="1" fieldCol="2" dictionary="bizBillStatus"/>--%>
<x:searchButtons/>
</form>
<div class="blank_div clearfix"></div>
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java
View file @ c4e69eea
......@@ -24,6 +24,8 @@ import com.huigou.topsun.sap.processOutsource.domain.ProcessOutsourceMaterial;
import com.huigou.topsun.sap.processOutsource.domain.ProcessOutsourceOrderItem;
import com.huigou.topsun.sap.processOutsource.repository.ProcessOutsourceMaterialRepository;
import com.huigou.topsun.sap.processOutsource.repository.ProcessOutsourceOrderItemRepository;
import com.huigou.topsun.sap.processQuotedPrice.application.ProcessQuotedPriceItemApplication;
import com.huigou.topsun.sap.processQuotedPrice.domain.ProcessQuotedPriceItemNumber;
import com.huigou.topsun.sap.purchaseApproval.application.impl.SapPurchaseApprovalApplicationImpl;
import com.huigou.topsun.sap.purchaseOrder.application.SapPurchaseOrderApplication;
import com.huigou.topsun.sap.purchaseOrder.application.SapPurchaseOrderItemApplication;
......@@ -95,6 +97,8 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
private ProcessOutsourceOrderItemRepository processOutsourceOrderItemRepository;
@Autowired
private ProcessOutsourceMaterialRepository processOutsourceMaterialRepository;
@Autowired
private ProcessQuotedPriceItemApplication processQuotedPriceItemApplication;
@Override
protected String saveBizAndApprovalData() {
......@@ -531,7 +535,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
BigDecimal netpr = purchaseOrderItem.getNetpr();//含税单价
BigDecimal kbetr2 = purchaseOrderItem.getKbetr2() == null ? BigDecimal.ZERO:purchaseOrderItem.getKbetr2();//运输费
BigDecimal kbetr3 = purchaseOrderItem.getKbetr3() == null ? BigDecimal.ZERO:purchaseOrderItem.getKbetr3();//包装费
BigDecimal amount = netpr.add(kbetr2).multiply(zero);
BigDecimal amount = netpr.add(kbetr2).add(kbetr3).multiply(zero);
map.put("netpr",netpr);
map.put("kbetr2",kbetr2);
map.put("kbetr3",kbetr3);
......@@ -575,7 +579,8 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
map.put("outProcess01",outsourceOrderItem.getTxz01());
map.put("outProcess02",outsourceOrderItem.getTxz02());
//临时工序外发，计算印张数；实际送货数量，LOSS数
BigDecimal number = (BigDecimal) map.getOrDefault("number",BigDecimal.ZERO);//成品数量
BigDecimal number = outsourceOrderItem.getMenge();//成品数量
map.put("number",number);
BigDecimal model = (BigDecimal)map.get("model") != null ? (BigDecimal)map.get("model") : BigDecimal.ZERO;//排版数量
BigDecimal printLoss = outsourceOrderItem.getPrintLoss() != null ? outsourceOrderItem.getPrintLoss() : BigDecimal.ZERO;//印张LOSS数
map.put("printLoss",printLoss);
......@@ -583,6 +588,8 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
BigDecimal printNumber = BigDecimal.ZERO;
if (number.compareTo(BigDecimal.ZERO) > 0 && model.compareTo(BigDecimal.ZERO) > 0){
printNumber = number.divide(model,2,RoundingMode.UP);
long l = printNumber.setScale(0, RoundingMode.UP).longValue();
printNumber = new BigDecimal(l);
}
map.put("printNumber",printNumber);
......@@ -600,6 +607,15 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
material.setDeliveryMethodOut(DictUtil.getDictionaryDetailText("deliveryMethodOut",material.getDeliveryMethodOut()));
}
map.put("materialList",materialList);
//查询工序报价
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("priceAmount",priceAmount);//合计单价
map.put("amount",priceAmount.multiply(number));//总价
return map;
}
}
topsun/src/main/java/com/huigou/topsun/sap/suppliers/application/impl/SuppliersDataApplicationImpl.java
View file @ c4e69eea
......@@ -63,32 +63,7 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
public Map<String, Object> slicedSuppliersDataQuery(SuppliersDataQueryRequest query) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedSuppliersInfoQuery");
QueryModel model = this.sqlExecutorDao.getQueryModel(queryDescriptor, query);
if (StringUtil.isNotBlank(query.getBillCode())) {
model.addCriteria(" and t.bill_code like:billCode");
model.putLikeParam("billCode", query.getBillCode());
}
if (StringUtil.isNotBlank(query.getNameOrg1())) {
model.addCriteria(" and t.name_Org1 like:nameOrg1");
model.putLikeParam("nameOrg1", query.getNameOrg1());
}
if (StringUtil.isNotBlank(query.getPartner())) {
model.addCriteria(" and t.partner like:partner");
model.putLikeParam("partner", query.getPartner());
}
if (query.getStatus() != null) {
model.addCriteria(" and t.status =:status");
model.putParam("status", query.getStatus());
}
if (StringUtil.isNotBlank(query.getApplyType())) {
model.addCriteria(" and t.apply_type =:applyType");
model.putParam("applyType", query.getApplyType());
}
// model.putDictionary("maintenanceType", DictUtil.getDictionary("maintainType"));
// model.putDictionary("baseUnit", DictUtil.getDictionary("measuringUnit"));
// model.putDictionary("itemAttributes", DictUtil.getDictionary("suppliesType"));
// model.putDictionary("businessUsage", DictUtil.getDictionary("serviceusage"));
model.putDictionary("status", DictUtil.getDictionary("bizBillStatus"));
model.addCriteria(" order by bill_code desc ");
return this.sqlExecutorDao.executeSlicedQuery(model);
}
......
topsun/src/main/java/com/huigou/topsun/sap/suppliers/controller/SuppliersDataController.java
View file @ c4e69eea
......@@ -67,6 +67,8 @@ public class SuppliersDataController extends CommonController {
String flag=sdo.getString("flag");
SuppliersInfo suppliersInfo = new SuppliersInfo();
suppliersInfo.setApplyType("0");
suppliersInfo.setSperr("0");
suppliersInfo.setSperm("0");
String isDel=sdo.getString("isDel");
String page = "suppliersDataDetail";
if (StringUtil.isNotBlank(isDel)){ //删除流程
......
topsun/src/main/java/com/huigou/topsun/sap/suppliers/domain/query/SuppliersDataQueryRequest.java
View file @ c4e69eea
package com.huigou.topsun.sap.suppliers.domain.query;
import com.huigou.data.domain.query.FlowBillSuperQueryRequest;
import com.huigou.data.domain.query.QueryAbstractRequest;
import lombok.Data;
import java.util.Date;
@Data
public class SuppliersDataQueryRequest extends FlowBillSuperQueryRequest {
public class SuppliersDataQueryRequest extends QueryAbstractRequest {
/**
......@@ -31,6 +34,7 @@ public class SuppliersDataQueryRequest extends FlowBillSuperQueryRequest {
* 组织名称2
*/
private String nameOrg2;
private String statusKind;
/**
......@@ -39,4 +43,9 @@ public class SuppliersDataQueryRequest extends FlowBillSuperQueryRequest {
private String nameOrg3;
private String applyType;
private String buGroup;
private String personMemberName;
protected Date fillinBeginDate;
protected Date fillinEndDate;
}
topsun/src/main/resources/config/topsun/sap/sapSuppliersData/suppliersData.xml
View file @ c4e69eea
......@@ -5,7 +5,15 @@
select t.* from sap_suppliers_info t
where 1=1
</sql-query>
<!-- <condition column="stats_indicators_id" name="statsIndicatorsId" type="java.lang.String" symbol="=" alias="t"/>-->
<condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
<condition column="name_Org1" name="nameOrg1" type="java.lang.String" symbol="like" alias="t"/>
<condition column="partner" name="partner" type="java.lang.String" symbol="like" alias="t"/>
<condition column="status" name="statusKind" type="java.lang.Integer" symbol="in" alias="t"/>
<condition column="apply_type" name="applyType" type="java.lang.String" symbol="=" alias="t"/>
<condition column="bu_group" name="buGroup" type="java.lang.String" symbol="=" alias="t"/>
<condition column="person_member_name" name="personMemberName" type="java.lang.String" symbol="=" alias="t"/>
<condition column="fillin_date" name="fillinBeginDate" type="java.util.Date" symbol="&gt;=" alias="t"/>
<condition column="fillin_date" name="fillinEndDate" type="java.util.Date" symbol="&lt;=" alias="t"/>
</query>
<query name="findDeletedByPartner" label="查询是否存在删除的数据" table="sap_suppliers_info">
<sql-query>
......
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