Commit 6ca949a3 authored by 鲁鑫's avatar 鲁鑫

物料主数据创建调整

parent 4955405a
...@@ -269,19 +269,19 @@ function bindEvent(){ ...@@ -269,19 +269,19 @@ function bindEvent(){
} }
}); });
//存储分区标识 //存储分区标识
$('#lgbkzName').searchbox({ // $('#lgbkzName').searchbox({
type: "system", name: "dictionary", // type: "system", name: "dictionary",
getParam: function (item) { // getParam: function (item) {
return { // return {
fieldName: "LGTYP", // fieldName: "LGTYP",
filterValue:$('#lgnum').val() // filterValue:$('#lgnum').val()
} // }
}, // },
onChange: function (value, data) { // onChange: function (value, data) {
$('#lgbkz').val(data.LGTYP); // $('#lgbkz').val(data.LGTYP);
$('#lgbkzName').val(data.LTYPT); // $('#lgbkzName').val(data.LTYPT);
} // }
}); // });
$('#lhme1Name').searchbox({ $('#lhme1Name').searchbox({
type: "system", name: "dictionary", type: "system", name: "dictionary",
......
...@@ -86,8 +86,8 @@ ...@@ -86,8 +86,8 @@
<x:hidden name="ltkza"/> <x:hidden name="ltkza"/>
<x:inputC name="ltkzeName" label="存货上架存储类型" labelCol="2" fieldCol="2" required="true" wrapper="select"/> <x:inputC name="ltkzeName" label="存货上架存储类型" labelCol="2" fieldCol="2" required="true" wrapper="select"/>
<x:hidden name="ltkze"/> <x:hidden name="ltkze"/>
<x:inputC name="lgbkzName" label="存储分区标识" labelCol="1" fieldCol="2" required="true" wrapper="select"/> <%-- <x:inputC name="lgbkzName" label="存储分区标识" labelCol="1" fieldCol="2" required="true" wrapper="select"/>--%>
<x:hidden name="lgbkz"/> <x:hidden name="lgbkz" value="001"/>
<x:inputC name="lhmg1" label="仓库设施1存储数量" labelCol="2" fieldCol="2" required="false" mask="99999999"/> <x:inputC name="lhmg1" label="仓库设施1存储数量" labelCol="2" fieldCol="2" required="false" mask="99999999"/>
<x:inputC name="lhme1Name" label="仓库设施1存储单位" labelCol="2" fieldCol="2" required="false" wrapper="select"/> <x:inputC name="lhme1Name" label="仓库设施1存储单位" labelCol="2" fieldCol="2" required="false" wrapper="select"/>
<x:hidden name="lhme1"/> <x:hidden name="lhme1"/>
......
...@@ -286,15 +286,22 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements ...@@ -286,15 +286,22 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
if ("0".equals(sapVO.getInsmk())){ if ("0".equals(sapVO.getInsmk())){
sapVO.setInsmk(""); sapVO.setInsmk("");
} }
if ("0".equals(sapVO.getRgekz())){
sapVO.setRgekz("");
}
//存储分区标识默认001
sapVO.setLgbkz("001");
//销售单位转换
if (StringUtil.isNotBlank(sapVO.getVrkme())){
Map<String,Object> unitsaleMap = new HashMap<>(); Map<String,Object> unitsaleMap = new HashMap<>();
List<Map<String,Object>> unitMapList = new ArrayList<>(); List<Map<String,Object>> unitMapList = new ArrayList<>();
//销售单位转换
unitsaleMap.put("MEINH",sapVO.getVrkme()); unitsaleMap.put("MEINH",sapVO.getVrkme());
unitsaleMap.put("UMREZ",sapVO.getUmrez()); unitsaleMap.put("UMREZ",sapVO.getUmrez());
unitsaleMap.put("UMREN",sapVO.getUmren()); //去掉sale lxh 03.29 unitsaleMap.put("UMREN",sapVO.getUmren()); //去掉sale lxh 03.29
unitsaleMap.put("MEINS",sapVO.getMeins()); unitsaleMap.put("MEINS",sapVO.getMeins());
unitMapList.add(unitsaleMap); unitMapList.add(unitsaleMap);
sapVO.setMapList(unitMapList); sapVO.setMapList(unitMapList);
}
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
String url = "bd_mastdata/material"; String url = "bd_mastdata/material";
String busiType="物料主数据推送SAP"; String busiType="物料主数据推送SAP";
...@@ -317,11 +324,14 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements ...@@ -317,11 +324,14 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
List<Map<String, Object>> resultList = objectMapper.readValue(result, new TypeReference<List<Map<String, Object>>>() { List<Map<String, Object>> resultList = objectMapper.readValue(result, new TypeReference<List<Map<String, Object>>>() {
}); });
Map<String, Object> returnMap = resultList.get(0); Map<String, Object> returnMap = resultList.get(0);
//推送SAP成功后,SAP会发给mes,并把消息返回。取数组下标1的是SAP创建成功返回消息。
if ("2".equals(returnMap.get("TYPE"))){
returnMap = resultList.get(1);
}
mapCopy(backMap,returnMap); mapCopy(backMap,returnMap);
// resultMap.put("businessType", busiType); // resultMap.put("businessType", busiType);
// resultMap.put("parameter", JSON.toJSONString(map)); // resultMap.put("parameter", JSON.toJSONString(map));
// resultMap.put("businessId", prodApplyBaseInfo.getId()); // resultMap.put("businessId", prodApplyBaseInfo.getId());
if ("S".equals(backMap.get("TYPE"))) { if ("S".equals(backMap.get("TYPE"))) {
backMap.put("type", "S"); backMap.put("type", "S");
backMap.put("MESSAGE", applyDept.getMatnr()+":"+backMap.get("MESSAGE")); backMap.put("MESSAGE", applyDept.getMatnr()+":"+backMap.get("MESSAGE"));
......
...@@ -27,212 +27,38 @@ ...@@ -27,212 +27,38 @@
and p.person_id = ? and p.person_id = ?
and t.dept_level = ? and t.dept_level = ?
</sql> </sql>
<!-- 采购申请信息 -->
<sql name="queryPurchaseApprovalInfo">
select t.system_id, t.system_full_id, t.purchase_kind
from ssrf_purchase_approval t
where t.id = ?
</sql>
<!-- 采购申请预算对应的组织信息-->
<sql name="queryPurchaseApprovalBudgetOrg">
select distinct r.system_full_id
from ssrf_purchase_approval_item t, ssrf_budget_record r
where t.approval_id = ?
and t.budget_code = r.code
</sql>
<sql name="queryPurchaseApprovalBudgetPerson">
select o.full_id, o.full_name
from (select distinct r.responsible_person_id
from ssrf_purchase_approval_item t, ssrf_budget_record r
where t.approval_id = ?
and t.budget_code = r.code) a,
sa_opperson p,
sa_oporg o
where a.responsible_person_id = p.id
and o.id = p.id || '@' || p.main_org_id
and o.status = 1
</sql>
<!-- 用款申请对应采购申请信息 -->
<sql name="queryMoneyUsedApprovalInfo">
select t.system_id, t.system_full_id, t.purchase_kind
from ssrf_purchase_approval t, ssrf_purchase_money_apply a
where t.id = a.purchase_approval_id
and a.id = ?
</sql>
<!-- 用款申请预算信息 -->
<sql name="queryMoneyUsedBudgetOrg">
select distinct r.system_full_id
from ssrf_purchase_money_used t, ssrf_budget_record r
where t.money_apply_id = ?
and t.budget_code = r.code
</sql>
<sql name="queryMoneyUsedBudgetPerson">
select o.full_id, o.full_name
from (select distinct r.responsible_person_id
from ssrf_purchase_money_used t, ssrf_budget_record r
where t.money_apply_id = ?
and t.budget_code = r.code) a,
sa_opperson p,
sa_oporg o
where a.responsible_person_id = p.id
and o.id = p.id || '@' || p.main_org_id
and o.status = 1
</sql>
<!-- 硬X使用管理权限信息 --> <!-- 硬X使用管理权限信息 -->
<sql name="queryBizManagementTypeByCode"> <sql name="queryBizManagementTypeByCode">
select distinct b.code from sa_opbasemanagementtype t, sa_opbizmanagementtype b where t.biz_management_type_id = b.id select distinct b.code from sa_opbasemanagementtype t, sa_opbizmanagementtype b where t.biz_management_type_id = b.id
</sql> </sql>
<!-- 根据系统编码获取线站负责人 -->
<sql name="queryStationLeaders">
SELECT t.FULL_ID, t.FULL_NAME FROM SA_OPORG t WHERE t.PARENT_ID
IN ( SELECT s.id FROM sa_oporg s WHERE s.parent_id
IN ( SELECT DISTINCT o.id FROM
( SELECT r.system_code FROM ssrf_purchase_approval_item t inner join SSRF_BUDGET_RECORD r on t.budget_code = r.CODE WHERE t.approval_id = ? ) a
inner join sa_oporg o on a.system_code = o.CODE AND o.STATUS = 1
)
AND s.CODE = 'xzfzr'
)
</sql>
<!-- 根据系统编码获取系统负责人 -->
<sql name="querySysUsers">
<!-- select s.full_id,s.full_name from sa_oporg s where
s.parent_id in(select distinct o.id from (select
r.system_code
from ssrf_purchase_approval_item t,
SSRF_BUDGET_RECORD r
where t.approval_id=?
and t.budget_code = r.code) a,sa_opperson p,sa_oporg o
where a.system_code=o.code and o.status=1) and s.code='xtfzr' -->
SELECT <!--根据业务主表id和业务表名查询创建人的直接上级-->
t.FULL_ID, <sql name="querybmjl">
t.FULL_NAME SELECT o.FULL_ID, o.FULL_NAME
FROM FROM sa_oporg o WHERE o.PARENT_ID IN (
SA_OPORG t SELECT o.PARENT_ID FROM sa_oporg o WHERE o.id IN ( SELECT o.PARENT_ID FROM sa_oporg o LEFT JOIN %s pro ON o.id = pro.person_member_id WHERE pro.id = ? ) )
WHERE AND o.CODE IN ( 'JL', 'ZZ', 'KZ', 'FL', 'FKZ' );
t.PARENT_ID IN (
SELECT
s.id
FROM
sa_oporg s
WHERE
s.parent_id IN (
SELECT DISTINCT
o.id
FROM
( SELECT r.system_code FROM ssrf_purchase_approval_item t inner join SSRF_BUDGET_RECORD r on t.budget_code = r.CODE WHERE t.approval_id = ? ) a
inner join sa_oporg o
on
a.system_code = o.CODE
AND o.STATUS = 1
)
AND s.CODE = 'xtfzr'
)
</sql> </sql>
<!-- 根据分总体编码获取分总体负责人 -->
<sql name="queryCollectUsers">
SELECT
s.full_id,
s.full_name
FROM
sa_oporg s
WHERE
s.parent_id IN (
SELECT
o.id
FROM
( SELECT r.collectivity_code FROM ssrf_purchase_approval_item t inner join
SSRF_BUDGET_RECORD r on t.budget_code = r.CODE WHERE t.approval_id = ? ) a
inner join sa_oporg o <!--根据业务主表id和业务表名查询对应申请人的二级部门领导-->
on <sql name="queryejbmld">
a.collectivity_code = o.CODE SELECT o.FULL_ID,o.FULL_NAME FROM sa_oporg o WHERE o.PARENT_ID IN (
where o.STATUS = 1 SELECT o.id FROM sa_oporg o WHERE o.PARENT_ID IN (
) SELECT o.PARENT_ID FROM sa_oporg o WHERE o.id IN (
AND s.CODE = 'fztfzr'; SELECT o.PARENT_ID FROM sa_oporg o WHERE o.id IN (
</sql> SELECT o.PARENT_ID FROM sa_oporg o LEFT JOIN %s pro ON o.id = pro.person_member_id WHERE pro.id = ? ) ) )
<!-- 根据分总体编码获取总师--> AND o.CODE IN ( 'JL', 'ZZ' ));
<sql name="queryTotalUsers"> </sql>
SELECT <!--根据业务主表id和业务表名查询对应申请人的一级部门领导-->
s.full_id, <sql name="queryyjbmld">
s.full_name SELECT o.FULL_ID,o.FULL_NAME FROM sa_oporg o WHERE o.PARENT_ID IN (
FROM SELECT o.id FROM sa_oporg o WHERE o.PARENT_ID IN (
sa_oporg s SELECT o.PARENT_ID FROM sa_oporg o WHERE o.id IN (
WHERE SELECT o.PARENT_ID FROM sa_oporg o WHERE o.id IN (
s.parent_id IN ( SELECT o.PARENT_ID FROM sa_oporg o WHERE
SELECT DISTINCT o.id IN ( SELECT o.PARENT_ID FROM sa_oporg o LEFT JOIN %s pro ON o.id = pro.person_member_id WHERE pro.id = ? ) ) ) )
o.id AND o.CODE IN ( 'JL', 'ZZ' ,'ZJ'));
FROM
( SELECT r.collectivity_code FROM ssrf_purchase_approval_item t inner join SSRF_BUDGET_RECORD r on t.budget_code = r.CODE WHERE t.approval_id =? ) a inner join
sa_oporg o
on
a.collectivity_code = o.CODE
AND o.STATUS = 1
)
AND s.CODE = 'zs'
</sql>
<!-- 大科学中心的预算,根据项目编码获取项目负责人//中心部主任/中心主任/法人等流程审批人-->
<sql name="queryDkxzxUsers">
<!--select s.full_id,s.full_name from sa_oporg s where
s.parent_id in(select distinct o.id from (select
r.pj_code
from ssrf_purchase_approval_item t,
SSRF_BUDGET_RECORD r
where t.approval_id=?
and t.budget_code = r.code) a,sa_opperson p,sa_oporg o
where a.pj_code=o.code and o.status=1) and s.code=?-->
SELECT
t.full_id,
t.full_name
FROM
sa_oporg t
WHERE
t.parent_id IN (
SELECT DISTINCT
s.id
FROM
sa_oporg s
WHERE
s.parent_id IN (
SELECT DISTINCT
o.id
FROM
( SELECT r.pj_code FROM ssrf_purchase_approval_item t inner join SSRF_BUDGET_RECORD r on t.budget_code = r.CODE WHERE t.approval_id = ? ) a inner join
sa_oporg o
on
a.pj_code = o.CODE
AND o.STATUS = 1
)
)
AND t.CODE = ?
</sql>
<!-- 根据分总体编码获取副总经理/总经理 -->
<sql name="queryManageUsers">
SELECT
sa.full_id,
sa.full_name
FROM
sa_oporg sa
WHERE
sa.parent_id IN (
SELECT
s.id
FROM
sa_oporg s
WHERE
s.parent_id IN (
SELECT DISTINCT
o.parent_id
FROM
( SELECT r.collectivity_code FROM ssrf_purchase_approval_item t inner join SSRF_BUDGET_RECORD r on t.budget_code = r.CODE WHERE t.approval_id = ? ) a inner join
sa_oporg o
on
a.collectivity_code = o.CODE
AND o.STATUS = 1
)
AND s.CODE = 'glbm'
)
AND sa.CODE = ?;
</sql> </sql>
</query> </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