Skip to content

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

物料主数据调整和修改

parent 62a81054
Hide whitespace changes
Inline Side-by-side
Showing with 203 additions and 49 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDetail.js
View file @ e97e6b19
var gridManager = null;
//applyType=0 新建 1 变更 2 扩展
$(document).ready(function () {
initialize();
......@@ -22,14 +23,14 @@ function initialize(){
var businessUsage = $("#businessUsage").find("checkbox");
businessUsage.attr("disabled", "disabled");
UICtrl.setDisable("#maintenanceType");
if (applyType=="1") {
if (applyType=="1") { //变更
$('#maintenanceType').attr('disabled', "disabled");
UICtrl.disable($("#maintenanceType"));
var maintenanceType = $("#maintenanceType").find("radio");
maintenanceType.attr("disabled", "disabled");
} else if (applyType=="2") {
} else if (applyType=="2") { //扩展
UICtrl.disable($("#genericName"));
UICtrl.disable($("#applicableStandard"));
UICtrl.disable($("#baseUnit"));
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDetail.jsp
View file @ e97e6b19
......@@ -4,7 +4,7 @@
<html>
<head>
<script type="text/javascript">
var applyType ="${applyType}";
var applyType ="${applyType}"; //0 新建 1变更 2 扩展
var isAll ="${isAll}";
</script>
<x:base include="layout,dialog,grid,tree,combox,commonTree,date,attachment"/>
......@@ -70,6 +70,9 @@
<x:inputC name="materialUsage" label="用途" labelCol="1" fieldCol="2"/>
<x:selectC name="itemAttributes" label="物品属性" labelCol="1" fieldCol="2" dictionary="suppliesType"/>
</div>
<div class="hg-form-row">
<x:textareaC rows="3" name="textDescription" label="情况说明" labelCol="1" fieldCol="11"/>
</div>
<c:if test="${applyType==2}">
<div class="hg-form-row">
<x:checkbox name="isAll" label="全选" />
......@@ -90,10 +93,6 @@
fieldCol="8"/>
</div>
</c:if>
<div class="hg-form-row">
<x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/>
</div>
<div style="padding-top: 15px;">
<x:fileList bizCode="nonProApplyInfo" bizId="attbizId" id="nonProApplyInfoList" title="上传附件" />
</div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
View file @ e97e6b19
......@@ -43,6 +43,8 @@ function initializate() {
$("#save").remove();
$("#back").remove();
UICtrl.setDisable("#basicInfoDiv");
$("#maktxRemZh").attr("readonly",true);
$("#maktxRemEn").attr("readonly",true);
$("#distributeDiv").show();
break;
case '2'://已分发
......@@ -295,26 +297,83 @@ function distributeForm() {
Public.successTip("已分发");
return false;
}
if ($("#werks").val()==""){
Public.tip("工厂必输！");
return false;
let deptStaffResult = gridManager.getData();
if (deptStaffResult.length<1){
Public.tip('未选择业务用途！');
return false
}
if ($("#lgort").val()==""){
Public.tip("库存地点必输！");
return false;
let hasSaleView = false;
for (var i = 0; i < deptStaffResult.length; i++) {
if (deptStaffResult[i].deptCode == "V") { //销售视图
hasSaleView = true;
break;
}
}
let hasWarehouseView = false;
for (var i = 0; i < deptStaffResult.length; i++) {
if (deptStaffResult[i].deptCode == "S") { //仓库视图
hasWarehouseView = true;
break;
}
}
let hasPurchaseView = false;
for (var i = 0; i < deptStaffResult.length; i++) {
if (deptStaffResult[i].deptCode == "E") { //采购视图
hasPurchaseView = true;
break;
}
}
let hasMRPView = false;
for (var i = 0; i < deptStaffResult.length; i++) {
if (deptStaffResult[i].deptCode == "D") { //MRP视图
hasMRPView = true;
break;
}
}
let hasProduceView = false;
for (var i = 0; i < deptStaffResult.length; i++) {
if (deptStaffResult[i].deptCode == "A") { //生产视图
hasProduceView = true;
break;
}
}
if ($("#vkorg").val()==""){
let hasStoreView = false;
for (var i = 0; i < deptStaffResult.length; i++) {
if (deptStaffResult[i].deptCode == "L") { //存储视图
hasStoreView = true;
break;
}
}
if (hasPurchaseView||hasStoreView||hasMRPView||hasProduceView) {
if ($("#werks").val() == "") {
Public.tip("工厂必输！");
return false;
}
}
if (hasWarehouseView||hasStoreView) {
if ($("#lgort").val() == "") {
Public.tip("库存地点必输！");
return false;
}
}
if (hasWarehouseView){
if ($("#lgnum").val() == "") {
Public.tip("仓库号必输！");
return false;
}
}
if (hasSaleView) {
if ($("#vkorg").val() == "") {
Public.tip("销售组织必输！");
return false;
}
if ($("#vtweg").val()==""){
}
if ($("#vtweg").val() == "") {
Public.tip("分销渠道必输！");
return false;
}
}
if ($("#lgnum").val()==""){
Public.tip("仓库号必输！");
return false;
}
let extendedData = getExtendedData();
if (!extendedData) return false;
$('#submitForm').ajaxSubmit({
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp
View file @ e97e6b19
......@@ -92,6 +92,9 @@
<x:inputC name="materialUsage" label="用途" labelCol="1" fieldCol="8"/>
</div>
<div class="hg-form-row">
<x:textareaC rows="3" name="textDescription" label="情况说明" labelCol="1" fieldCol="11" readonly="true"/>
</div>
</div>
<x:title title="维护基本信息" name="group"/>
<div class="hg-form-cols" id="basicInfoDiv">
......@@ -181,11 +184,12 @@
<x:title id="personTitle" title="业务人员" name="group"/>
<div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div>
</div>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/>
<x:textareaC rows="3" name="maktxRemZh" label="中文文本说明" labelCol="1" fieldCol="11"/>
<x:textareaC rows="3" name="maktxRemEn" label="英文文本说明" labelCol="1" fieldCol="11"/>
</div>
</div>
<div class="hg-form-cols">
</div>
<div id="businessUsageDiv">
<%-- <x:title title="分类" name="group"/>--%>
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordDetail.js
View file @ e97e6b19
......@@ -449,6 +449,14 @@ function getGridColumns() {
{display: "等级金额3", name: "kbetr3", width: "100", align: "left", type: "string"
//,editor: {type: 'text', mask: '9999999.99'}
},
{display: "等级数量4", name: "kstbm4", width: "100", align: "left", type: "string"
},
{display: "等级金额4", name: "kbetr4", width: "100", align: "left", type: "string"
},
{display: "等级数量5", name: "kstbm5", width: "100", align: "left", type: "string"
},
{display: "等级金额5", name: "kbetr5", width: "100", align: "left", type: "string"
},
// {
// display: "传输日期", name: "sendTime", width: "100", align: "left", type: "string",
// editor: {type: 'date'}
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java
View file @ e97e6b19
......@@ -55,6 +55,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
@Override
//业务的保存和提交
public Map<String,Object> saveSapNonProdApplyDept(SDO sdo){
Map<String,Object> map = new HashMap<>();
map.put("result","");
......@@ -106,6 +107,8 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
baseInfo.setBrand(sdo.getString("brand"));
baseInfo.setBrand(sdo.getString("brandName"));
}
// baseInfo.setMaktxRemZh(sdo.getString("maktxRemZh"));
// baseInfo.setMaktxRemEn(sdo.getString("maktxRemEn"));
nonProdApplyBaseInfoRepository.save(baseInfo);
NonProdApplyDeptVo deptVo=null;
......@@ -119,28 +122,28 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
case "V": //销售
deptVo = sdo.toObject(NonProdApplySaleVo.class);
break;
case "E":
case "E": //采购
deptVo = sdo.toObject(NonProdApplyPurchaseVo.class);
break;
case "D":
case "D": //MRP
deptVo = sdo.toObject(NonProdApplyMRPVo.class);
break;
case "A":
case "A": //生产
deptVo = sdo.toObject(NonProdApplyProduceVo.class);
break;
case "L":
case "L": //存储
deptVo = sdo.toObject(NonProdApplyStoreVo.class);
break;
case "S":
case "S": //仓库
deptVo = sdo.toObject(NonProdApplyWarehouseVo.class);
break;
case "Q":
case "Q": //质量
deptVo = sdo.toObject(NonProdApplyMassVo.class);
break;
case "B":
case "B": //财务
deptVo = sdo.toObject(NonProdApplyFinancialVo.class);
break;
case "G":
case "G": //成本
deptVo = sdo.toObject(NonProdApplyCostVo.class);
break;
default:
......@@ -234,7 +237,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
}
/**
* 发布任务
* 分发任务
* @param sdo
*/
@Override
......@@ -256,7 +259,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
//结束分发任务的待办信息
NonProdApplyBaseInfo nonProdApplyBaseInfo=nonProdApplyBaseInfoRepository.findOne(sdo.getString("id"));
//SapNonProdApplyDept sapNonProdApplyDept=nonProdApplyDeptRepository.findByBaseInfoId(sdo.getString("id"));
if(nonProdApplyBaseInfo.getMaintenanceType().equals("new")) { //新申请的 分发后结束分发人的待办信息 06.17
BsnMessageSponsor bsnMessageSponsor=bsnMessageSponsorRepository.findByBusinessId(nonProdApplyBaseInfo.getId());
if (bsnMessageSponsor!=null){
......@@ -315,6 +318,8 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
String backStr="";
ProdApplyToSapVO sapVO=new ProdApplyToSapVO();
ClassHelper.copyProperties(baseInfo,sapVO);
applyDept.setMaktxRemZh(baseInfo.getMaktxRemZh());
applyDept.setMaktxRemEn(baseInfo.getMaktxRemEn());
ClassHelper.copyProperties(applyDept,sapVO);
if ("0".equals(sapVO.getXchpf())){ //批次管理 否 传递空
......@@ -399,8 +404,18 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
throw new RuntimeException(backStr);
} finally {
sapMutualEpLogApplication.saveSapMutualEpLog(backMap);
Operator operator = operatorApplication.createOperatorByPersonMemberId(baseInfo.getPersonMemberId());
saveBsnMessageData(baseInfo,applyDept,operator,backMap);
//Operator operator = operatorApplication.createOperatorByPersonMemberId(baseInfo.getPersonMemberId());
//向货源专员 发重新分发的消息
String sql="select p.id,p.code,p.name,o.dept_name,o.dept_code,o.id person_member_id,o.position_name,o.position_code from sa_opperson p " +
"left join sa_oporg o on p.CODE=o.code where MAIN_ORG_ID in (select id from sa_oporg where code='HYZY')";
List<Map<String, Object>> mapLists = this.sqlExecutorDao.queryToListMap(sql);
Operator operator=null;
for (Map maps : mapLists) {
operator=new Operator();
operator.setDeptCode("HYZY");
operator.setPersonMemberId(maps.get("personMemberId").toString());
saveBsnMessageData(baseInfo,applyDept,operator,backMap);
}
return backStr;
}
......@@ -422,12 +437,18 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
//保存待办的消息
public void saveBsnMessageData(NonProdApplyBaseInfo baseInfo, SapNonProdApplyDept applyDept, Operator operator,Map<String,Object> map) {
BsnMessageSponsor bsnMessageSponsor=bsnMessageSponsorRepository.findByBusinessId(applyDept.getApplyDeptId());
String personMemberId = operator.getPersonMemberId();//stringMap.get("userCode");
if (bsnMessageSponsor==null) {
bsnMessageSponsor = new BsnMessageSponsor();
bsnMessageSponsor.setTaskSponsor(operator.getLoginUser().getId());
bsnMessageSponsor.setTaskSponsor(personMemberId.split("@")[0]);
bsnMessageSponsor.setTitle(baseInfo.getGenericName());//通用品名
bsnMessageSponsor.setExecutorUrl("sapNonProdApplyNext/forwardNonProdApplyNext.do?prod=1&isReadOnly=false");
bsnMessageSponsor.setBusinessId(applyDept.getApplyDeptId());
if ("product".equals(baseInfo.getKind())){
bsnMessageSponsor.setExecutorUrl("sapNonProdApplyNext/forwardNonProdApplyNext.do?prod=1&isReadOnly=false");
} else {
bsnMessageSponsor.setExecutorUrl("sapNonProdApplyNext/forwardNonProdApplyNext.do?isReadOnly=false");
}
//bsnMessageSponsor.setBusinessId(applyDept.getApplyDeptId());
bsnMessageSponsor.setBusinessId(baseInfo.getId()); //货源专员 存base_info的ID
bsnMessageSponsor.setCreateDate(new Date());
bsnMessageSponsor.setStatus(0);
}
......@@ -437,12 +458,12 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
//deptStaffList.add(map);
// for (Map<String, String> stringMap : deptStaffList) {
BsnMessageExecute messageExecute = new BsnMessageExecute();
String userCode = operator.getPersonMemberId();//stringMap.get("userCode");
String deptName = operator.getDeptName();//stringMap.get("deptName");
String deptCode = operator.getDeptCode();//stringMap.get("deptCode");
String[] split = userCode.split("@");
messageExecute.setTaskExecute(split[0]);
messageExecute.setBusinessCode(deptCode);
// String personMemberId = operator.getPersonMemberId();//stringMap.get("userCode");
// String deptName = operator.getDeptName();//stringMap.get("deptName");
// String deptCode = operator.getDeptCode();//stringMap.get("deptCode");
//String[] split = userCode.split("@");
messageExecute.setTaskExecute(personMemberId.split("@")[0]);
messageExecute.setBusinessCode(operator.getDeptCode());
messageExecute.setActive(ActiveStatus.UNFINISHED.getValue());
messageExecute.setUpdateDate(new Date());
// if ("product".equals(baseInfo.getKind())) {
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyNextController.java
View file @ e97e6b19
......@@ -285,6 +285,33 @@ public class NonProdApplyNextController extends CommonController {
}
this.putAttribute("businessUsageUnSeledList",unMapTmp);
return forward("nonProdApplyNext", nonProdApplyDept);
case "HYZY":
baseInfo.setApplyType("0");
if (baseInfo.getMaintenanceType().equals("modify")) {
baseInfo.setApplyType("1");
} else if (baseInfo.getMaintenanceType().equals("extend")) {
baseInfo.setApplyType("2");
}
this.putAttribute("applyType",baseInfo.getApplyType());
this.putAttribute("active",baseInfo.getDistribute());
Map <String,String>dictMapUsage2=DictUtil.getDictionary("serviceusage");
String dictMapUsages2="";
for (Map.Entry<String, String> entry: dictMapUsage2.entrySet()) {
// String key = entry.getKey().toUpperCase();
dictMapUsages2+=entry.getKey().toUpperCase()+","+entry.getValue()+";";
}
dictMapUsages=dictMapUsages2.substring(0,dictMapUsages2.length()-1);
this.putAttribute("dictUsages",dictMapUsages);
Map <String, String>unMapTmp2=new HashMap();
for (Map.Entry<String, String> entry : dictMapUsage2.entrySet()) {
String key = entry.getKey().toUpperCase();
// boolean isexists = false;
if (!"K".equals(key)) {
unMapTmp2.put(key, entry.getValue());
}
}
this.putAttribute("businessUsageUnSeledList",unMapTmp2);
return forward("nonProdApplyNext", nonProdApplyDept);
case "K":
this.putAttribute("active",2); //已经分发的 填写基本数据
this.putAttribute("applyType",3);
......@@ -363,9 +390,12 @@ public void getBaseInfoAttrs(NonProdApplyBaseInfo baseInfo,SapNonProdApplyDept n
nonProdApplyDept.setMaterialUsage(baseInfo.getMaterialUsage());
nonProdApplyDept.setItemAttributes(baseInfo.getItemAttributes());
nonProdApplyDept.setDistribute(baseInfo.getDistribute());
nonProdApplyDept.setKind(baseInfo.getKind());
nonProdApplyDept.setDistribute(baseInfo.getDistribute());
nonProdApplyDept.setKind(baseInfo.getKind());
nonProdApplyDept.setCreatedDate(baseInfo.getCreatedDate());
nonProdApplyDept.setMaktxRemEn(baseInfo.getMaktxRemEn());
nonProdApplyDept.setMaktxRemZh(baseInfo.getMaktxRemZh());
}
// @EasySearch(queryName = "userNameSelect")
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/NonProdApplyBaseInfo.java
View file @ e97e6b19
......@@ -107,11 +107,24 @@ public class NonProdApplyBaseInfo extends FlowBillAbstractEntity {
private String businessUsage;
/**
* 文本说明
* 情况说明
*/
@Column(name = "text_description")
private String textDescription;
/**
* 中文文本说明
*/
@Column(name = "maktx_rem_zh")
private String maktxRemZh;
/**
* 英文文本说明
*/
@Column(name = "maktx_rem_en")
private String maktxRemEn;
@Column(name ="created_date")
@CreatedDate
@JSONField(format="yyyy-MM-dd HH:mm:ss")
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/SapNonProdApplyDept.java
View file @ e97e6b19
......@@ -952,6 +952,11 @@ public class SapNonProdApplyDept implements Serializable {
@Transient
private String kind;
@Transient
private String maktxRemZh;
@Transient
private String maktxRemEn;
@Transient
private Date createdDate;
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyBasicVo.java
View file @ e97e6b19
......@@ -169,4 +169,7 @@ public class NonProdApplyBasicVo extends NonProdApplyDeptVo {
private String lgproName;
private String groes;
private String maktxRemZh;
private String maktxRemEn;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/ProdApplyFromSapVO.java
View file @ e97e6b19
......@@ -42,6 +42,10 @@ public class ProdApplyFromSapVO {
*/
private String specifications;
/**
* 规格尺寸
*/
private String groes;
/**
* 版式
*/
......@@ -153,8 +157,8 @@ public class ProdApplyFromSapVO {
@JsonProperty("MEINS")
private String meins;
// @JsonProperty("meins_name")
// private String meinsName;
@JsonProperty("meins_name")
private String meinsName;
/**
* 毛重
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/ProdApplyToSapVO.java
View file @ e97e6b19
......@@ -800,6 +800,12 @@ public class ProdApplyToSapVO {
@JsonProperty("EKLAS")
private String eklas;
@JsonProperty("MAKTX_REM_ZH")
private String maktxRemZh;
@JsonProperty("MAKTX_REM_EN")
private String maktxRemEn;
@JsonProperty("TMARM")
private List<Map<String,Object>> mapList;
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/application/impl/SapPurchaseInfoRecordApplicationImpl.java
View file @ e97e6b19
......@@ -167,6 +167,7 @@ public class SapPurchaseInfoRecordApplicationImpl extends FlowBroker implements
}
sapPurchaseInfoRecordItem.setTYPE(sapResult.getTYPE());
sapPurchaseInfoRecordItem.setMESSAGE(sapResult.getMESSAGE());
// sapPurchaseInfoRecordItem.setInfnr();//回写信息记录编号 待确认 //？？？？？
sapPurchaseInfoRecordItemApplication.save(sapPurchaseInfoRecordItem);
} catch (IOException e) {
resultMap.put("TYPE", "E");
......
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