Skip to content

T
topsun-bpm
Commit 829730ef authored by 刘学辉's avatar 刘学辉
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 1e64e316 897d41e5
Show whitespace changes
Inline Side-by-side
Showing with 369 additions and 6 deletions
topsun-xt/src/main/webapp/biz/topsun/ep/epSaleOrder/epSaleOrderCancelDetail.js
View file @ 829730ef
......@@ -6,6 +6,7 @@ $(document).ready(function () {
bindEvent();
});
function initialize(){
UICtrl.setDisable($("#submitForm"));
// var orderTypeName = $("#orderTypeName").val();
// $('#jobBizBillBody .subject').html(orderTypeName);
UICtrl.layout("#layout", {leftWidth: 3});
......@@ -90,7 +91,7 @@ function loadGrid() {
usePager: true,
parms:{epSaleOrderCancelId:getId()},
toolbar: toolbarOptions,
enabledEdit: true,
enabledEdit: false,
width: "100%",
height: "60%",
heightDiff: -8,
......
topsun-xt/src/main/webapp/biz/topsun/ep/epSaleOrder/epSaleOrderCancelDetail.jsp
View file @ 829730ef
......@@ -28,10 +28,10 @@
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="customerName" required="false" label="客户名称" labelCol="1" fieldCol="2"/>
<x:inputC name="productType" required="true" label="产品类型" labelCol="1" fieldCol="2"/>
<x:inputC name="productType" required="false" label="产品类型" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:radioC name="isCancel" required="true" label="原订单是否取消" labelCol="1" dictionary="yesorno" fieldCol="2"/>
<x:selectC name="isCancel" required="false" label="原订单取消/修改" labelCol="1" dictionary="isCancel" fieldCol="2"/>
</div>
</div>
<div class="blank_div clearfix"></div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/costReimbursement.js
View file @ 829730ef
......@@ -768,7 +768,7 @@ function setId(id) {
/**
* 流程引擎获取打样申请id的回掉方法。
* @return 打样申请的id
* @return
*/
function getId() {
return $("#id").val() || "";
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/costReimbursement.jsp
View file @ 829730ef
......@@ -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,date"/>
<x:base include="layout,dialog,grid,tree,combox,commonTree,date,attachment"/>
<x:script src='/biz/topsun/sap/costReimbursement/costReimbursement.js'/>
</head>
<body>
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssetsDetail.jsp
View file @ 829730ef
......@@ -36,6 +36,7 @@
<x:inputC name="anlkl" required="true" label="资产分类" labelCol="2" maxLength="64" fieldCol="4" wrapper="select"/>
<x:inputC name="bukrs" required="true" label="公司代码" labelCol="2" maxLength="64" fieldCol="4" wrapper="select"/>
<x:inputC name="txt50" required="true" label="文本" labelCol="2" maxLength="64" fieldCol="4"/>
<x:inputC name="txa50" required="true" label="规格型号" labelCol="2" maxLength="64" fieldCol="4"/>
<x:inputC name="invnr" required="false" label="存货号" labelCol="2" maxLength="64" fieldCol="4" />
<x:inputC name="menge" required="true" label="数量" labelCol="2" maxLength="64" fieldCol="4" />
<x:inputC name="meins" required="true" label="基本计量单位" labelCol="2" maxLength="64" fieldCol="4" wrapper="select"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssetsList.js
View file @ 829730ef
......@@ -29,6 +29,7 @@ function loadCostCenterListGrid() {
{display: "资产分类", name: "anlkl", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "公司代码", name: "bukrs", width: 100, minWidth: 60, type: "string", align: "left"},
{display: "文本", name: "txt50", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "规格型号", name: "txa50", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "存货号", name: "invnr", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "数量", name: "menge", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "基本计量单位", name: "meins", width: 140, minWidth: 60, type: "string", align: "left"},
......
topsun/src/main/java/com/huigou/topsun/base/orgImport/OrgExcelImport.java 0 → 100644
View file @ 829730ef
package com.huigou.topsun.base.orgImport;
import cn.hutool.core.util.ObjectUtil;
import com.huigou.topsun.base.orgImport.domain.TmpOrgData;
import com.huigou.topsun.base.orgImport.repository.OrgImportRepository;
import com.huigou.topsun.base.orgImport.repository.TmpOrgDataRepository;
import com.huigou.topsun.sap.fixedAssets.domain.TmpFixedAssessData;
import com.huigou.topsun.sap.fixedAssets.repository.TmpFixedAssessDataRepository;
import com.huigou.uasp.bmp.opm.application.OrgApplication;
import com.huigou.uasp.bmp.opm.domain.model.org.Org;
import com.huigou.uasp.tool.dataimport.application.ExcelImportInterface;
import com.huigou.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
@Service("orgExcelImport")
public class OrgExcelImport implements ExcelImportInterface {
@Autowired
private OrgApplication orgApplication;
@Autowired
private TmpOrgDataRepository tmpOrgDataRepository;
@Autowired
private OrgImportRepository orgImportRepository;
@Override
public void executeImport(String batchNumber) {
List<TmpOrgData> byBatchNumber = tmpOrgDataRepository.findByBatchNumber(batchNumber);
// for (TmpOrgData tmpOrgData : byBatchNumber) {
// String name = tmpOrgData.getName();
// String[] split = name.split("/");
//
// }
System.out.println("========================="+byBatchNumber);
}
}
topsun/src/main/java/com/huigou/topsun/base/orgImport/OrgPersonExcelImport.java 0 → 100644
View file @ 829730ef
package com.huigou.topsun.base.orgImport;
import com.huigou.topsun.base.orgImport.domain.TmpOrgPersonData;
import com.huigou.topsun.base.orgImport.repository.TmpOrgPersonDataRepository;
import com.huigou.uasp.tool.dataimport.application.ExcelImportInterface;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service("orgPersonExcelImport")
public class OrgPersonExcelImport implements ExcelImportInterface {
@Autowired
private TmpOrgPersonDataRepository personDataRepository;
@Override
public void executeImport(String batchNumber) {
List<TmpOrgPersonData> byBatchNumber = personDataRepository.findByBatchNumber(batchNumber);
// for (TmpOrgData tmpOrgData : byBatchNumber) {
// String name = tmpOrgData.getName();
// String[] split = name.split("/");
//
// }
System.out.println("========================="+byBatchNumber);
}
}
topsun/src/main/java/com/huigou/topsun/base/orgImport/domain/TmpOrgData.java 0 → 100644
View file @ 829730ef
package com.huigou.topsun.base.orgImport.domain;
import com.huigou.topsun.common.AbstractPortalOrg;
import lombok.Getter;
import lombok.Setter;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
* 组织导入
*/
@Table(name = "tmp_org_data")
@Entity
@Getter
@Setter
public class TmpOrgData extends AbstractPortalOrg {
/**
* 部门
*/
@Column(name = "name")
private String name;
/**
* 上级完整路径
*/
@Column(name = "parent_name")
private String parentName;
/**
* 排序号
*/
@Column(name = "SORT_ID")
private Integer sortId;
/**
* 类型
*/
@Column(name = "kind")
private String kind;
}
topsun/src/main/java/com/huigou/topsun/base/orgImport/domain/TmpOrgPersonData.java 0 → 100644
View file @ 829730ef
package com.huigou.topsun.base.orgImport.domain;
import com.huigou.topsun.common.AbstractPortalOrg;
import lombok.Getter;
import lombok.Setter;
import javax.persistence.*;
/**
* 组织人员导入
*/
@Table(name = "tmp_org_person_data")
@Entity
@Getter
@Setter
public class TmpOrgPersonData extends AbstractPortalOrg {
/**
* 名称
*/
@Column(name = "name")
private String name;
/**
* 编码
*/
@Column(name = "code")
private String code;
/**
* 上级完整路径
*/
@Column(name = "parent_name")
private String parentName;
/**
* 性别
*/
@Column(name = "sex")
private String sex;
/**
* 排序号
*/
@Column(name = "SORT_ID")
private Integer sortId;
/**
* 是否SAP员工
*/
@Column(name = "IS_SAP_PERSON")
private String isSapPerson;
/**
* 语言
*/
@Column(name = "LANGU")
private String langu;
/**
* 国家
*/
@Column(name = "COUNTRY")
private String country;
/**
* 地区
*/
@Column(name = "area")
private String area;
/**
* 银行所属国家
*/
@Column(name = "BANK_COUNTRY")
private String bankCountry;
/**
* 银行代码
*/
@Column(name = "BANK_CODE")
private String bankCode;
/**
* 银行账号
*/
@Column(name = "BANK_ACCOUNT_NUMBER")
private String bankAccountNumber;
/**
* 参考明细
*/
@Column(name = "CONSULT_ITEM")
private String consultItem;
/**
* 公司代码
*/
@Column(name = "COMPANY_CODE")
private String companyCode;
/**
* email
*/
@Column(name = "email")
private String email;
/**
* 证件号码
*/
@Column(name = "certificate_no")
private String certificateNo;
/**
* 婚姻状况
*/
@Column(name = "marriage")
private String marriage;
/**
* 出生日期
*/
@Column(name = "birthday")
private String birthday;
/**
* 参加工作日期
*/
@Column(name = "join_date")
private String joinDate;
/**
* 学历
*/
@Column(name = "degree")
private String degree;
/**
* 毕业院校
*/
@Column(name = "graduate_school")
private String graduateSchool;
/**
* 专业
*/
@Column(name = "speciality")
private String speciality;
/**
* 移动电话
*/
@Column(name = "mobile_phone")
private String mobilePhone;
/**
* 办公室电话
*/
@Column(name = "office_phone")
private String officePhone;
/**
* 邮编
*/
@Column(name = "zip")
private String zip;
/**
* 家庭住址
*/
@Column(name = "family_address")
private String familyAddress;
}
topsun/src/main/java/com/huigou/topsun/base/orgImport/repository/OrgImportRepository.java 0 → 100644
View file @ 829730ef
package com.huigou.topsun.base.orgImport.repository;
import com.huigou.uasp.bmp.opm.domain.model.org.Org;
import org.springframework.data.jpa.repository.JpaRepository;
/**
* @Auther: xin.lu
* @Date: 2024/03/27/14:39
* @Description:
*/
public interface OrgImportRepository extends JpaRepository<Org,String> {
Org findByName(String name);
Org findByFullName(String fullName);
Org findByParentIdAndCode(String parentId,String code);
}
topsun/src/main/java/com/huigou/topsun/base/orgImport/repository/TmpOrgDataRepository.java 0 → 100644
View file @ 829730ef
package com.huigou.topsun.base.orgImport.repository;
import com.huigou.topsun.base.orgImport.domain.TmpOrgData;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
/**
* @Auther: xin.lu
* @Date: 2024/03/27/14:21
* @Description:
*/
public interface TmpOrgDataRepository extends JpaRepository<TmpOrgData,String> {
List<TmpOrgData> findByBatchNumber(String batchNumber);
}
topsun/src/main/java/com/huigou/topsun/base/orgImport/repository/TmpOrgPersonDataRepository.java 0 → 100644
View file @ 829730ef
package com.huigou.topsun.base.orgImport.repository;
import com.huigou.topsun.base.orgImport.domain.TmpOrgPersonData;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
/**
* @Auther: xin.lu
* @Date: 2024/03/28/11:20
* @Description:
*/
public interface TmpOrgPersonDataRepository extends JpaRepository<TmpOrgPersonData,String> {
List<TmpOrgPersonData> findByBatchNumber(String batchNumber);
}
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/domain/SapFixedAssets.java
View file @ 829730ef
......@@ -55,6 +55,12 @@ public class SapFixedAssets extends FlowBillAbstractEntity {
@Column(name = "txt50")
private String txt50;
/**
* 规格型号
*/
@Column(name = "txa50")
private String txa50;
/**
* 存货号；存放地点
*/
......@@ -176,6 +182,14 @@ public class SapFixedAssets extends FlowBillAbstractEntity {
this.txt50 = txt50;
}
public String getTxa50() {
return txa50;
}
public void setTxa50(String txa50) {
this.txa50 = txa50;
}
public String getInvnr() {
return invnr;
}
......
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/domain/vo/SapFixedAssetsReturnVo.java
View file @ 829730ef
......@@ -54,6 +54,12 @@ public class SapFixedAssetsReturnVo implements Serializable {
@JsonProperty("TXT50")
private String txt50;
/**
* 规格型号
*/
@JsonProperty("TXA50")
private String txa50;
/**
* 存货号；存放地点
*/
......@@ -132,6 +138,14 @@ public class SapFixedAssetsReturnVo implements Serializable {
this.txt50 = txt50;
}
public String getTxa50() {
return txa50;
}
public void setTxa50(String txa50) {
this.txa50 = txa50;
}
public String getInvnr() {
return invnr;
}
......
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/domain/vo/SapFixedAssetsVo.java
View file @ 829730ef
......@@ -54,6 +54,8 @@ public class SapFixedAssetsVo implements Serializable {
*/
private String txt50;
private String txa50;
/**
* 存货号；存放地点
*/
......
topsun/src/main/java/com/huigou/topsun/syncOrg/application/impl/OrgSyncApplicationImpl.java
View file @ 829730ef
......@@ -40,7 +40,7 @@ public class OrgSyncApplicationImpl extends BaseApplication implements OrgSyncAp
List<Org> orgList = orgRepository.findAll();
orgList = orgList
.stream()
.filter(org -> org.getFullId().contains("/E3B4E5C5C6454F81921CF58B7597CE2F"))
.filter(org -> !"INIT_ORG".equals(org.getOrgCode()))
.collect(Collectors.toList());
//机构、部门、岗位
List<OrgVo> orgVoList = orgList
......
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