Skip to content

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

物料集团级删除；校验物料名称是否重复

parent b4f984eb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 966 additions and 725 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/materialApplyNext.js
View file @ c0f7f5e1
......@@ -878,7 +878,7 @@ function bindEvent_financial(mtart) {
$("#mlast").val("2");//价格确定
$("#vprsv").val("V");//价格控制
$("#peinh").val("1");//定价基数
$("#ncost").val("X");//不参与成本核算
$("#ncost").val("0");//不参与成本核算
$("#hkmat").val("X");//物料来源
$("#ekalr").val("X");//数量结构
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
View file @ c0f7f5e1
......@@ -540,8 +540,10 @@ function financialDisplayNcost(vprsv) { // alert("-="+vprsv);
$('#ncost').val('0');
$('#ncost_text').val('0-空');
} else {
$('#ncost').val('X');
$('#ncost_text').val('X-是');
// $('#ncost').val('X');
// $('#ncost_text').val('X-是');
$('#ncost').val('0');
$('#ncost_text').val('0-空');
}
$('#mlast').val('2');
$('#mlast_text').val('基于交易的');
......
topsun/src/main/java/com/huigou/topsun/ep/controller/EpResourceSearchController.java
View file @ c0f7f5e1
......@@ -5,6 +5,7 @@ import com.huigou.topsun.sap.sapApplication.application.SapDictionaryApplication
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.bmp.common.easysearch.EasySearch;
import com.huigou.util.SDO;
import com.huigou.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
......@@ -29,6 +30,9 @@ public class EpResourceSearchController {
@EasySearch(queryName = "queryBrand")
public Map<String, Object> queryBrand(SDO sdo) throws IOException {
String param = sdo.getString("paramValue");
if (StringUtil.isNotBlank(param)){
param = param.toUpperCase();
}
List<Map<String, String>> mapList = new ArrayList<>();
mapList = epApplication.queryEpBrand(param);
return sapDictionaryApplication.initEasySearchModel( mapList, param, sdo);
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java
View file @ c0f7f5e1
......@@ -129,53 +129,57 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
} else { //扩展的 设置默认基本字段
newSapNonProdApplyDept.setMatnr(sapNonProdApplyDept.getMatnr());
newSapNonProdApplyDept.setMatkl(sapNonProdApplyDept.getMatkl());
newSapNonProdApplyDept.setMatklName(sapNonProdApplyDept.getMatklName());
newSapNonProdApplyDept.setGroes(sapNonProdApplyDept.getGroes());
newSapNonProdApplyDept.setMtart(sapNonProdApplyDept.getMtart());
newSapNonProdApplyDept.setLvorm(sapNonProdApplyDept.getLvorm());
newSapNonProdApplyDept.setSpart(sapNonProdApplyDept.getSpart());
newSapNonProdApplyDept.setSpartName(sapNonProdApplyDept.getSpartName());
newSapNonProdApplyDept.setMtposMara(sapNonProdApplyDept.getMtposMara());
newSapNonProdApplyDept.setMaktx(sapNonProdApplyDept.getMaktx());
newSapNonProdApplyDept.setSpars(sapNonProdApplyDept.getSpars());
newSapNonProdApplyDept.setMaktx(sapNonProdApplyDept.getMaktx());
newSapNonProdApplyDept.setSpars(sapNonProdApplyDept.getSpars());
newSapNonProdApplyDept.setNormt(sapNonProdApplyDept.getNormt());
newSapNonProdApplyDept.setXchpf(sapNonProdApplyDept.getXchpf());
newSapNonProdApplyDept.setMagrv(sapNonProdApplyDept.getMagrv());
newSapNonProdApplyDept.setMaktx(sapNonProdApplyDept.getMaktx());
newSapNonProdApplyDept.setMaktxEn(sapNonProdApplyDept.getMaktxEn());
newSapNonProdApplyDept.setMeins(sapNonProdApplyDept.getMeins());
newSapNonProdApplyDept.setMeinsName(sapNonProdApplyDept.getMeinsName());
newSapNonProdApplyDept.setGroes(sapNonProdApplyDept.getGroes());
newSapNonProdApplyDept.setRaube(sapNonProdApplyDept.getRaube());
newSapNonProdApplyDept.setBrgew(sapNonProdApplyDept.getBrgew());
newSapNonProdApplyDept.setNtgew(sapNonProdApplyDept.getNtgew());
newSapNonProdApplyDept.setGewei(sapNonProdApplyDept.getGewei());
newSapNonProdApplyDept.setVolum(sapNonProdApplyDept.getVolum());
newSapNonProdApplyDept.setVoleh(sapNonProdApplyDept.getVoleh());
newSapNonProdApplyDept.setRaube(sapNonProdApplyDept.getRaube());
newSapNonProdApplyDept.setIprkz(sapNonProdApplyDept.getIprkz());
newSapNonProdApplyDept.setMhdrz(sapNonProdApplyDept.getMhdrz());
newSapNonProdApplyDept.setMhdhb(sapNonProdApplyDept.getMhdhb());
newSapNonProdApplyDept.setMhdrz(sapNonProdApplyDept.getMhdrz());
newSapNonProdApplyDept.setNormt(sapNonProdApplyDept.getNormt());
newSapNonProdApplyDept.setLength(sapNonProdApplyDept.getLength());
newSapNonProdApplyDept.setWidthCm(sapNonProdApplyDept.getWidthCm());
newSapNonProdApplyDept.setThickness(sapNonProdApplyDept.getThickness());
newSapNonProdApplyDept.setWeight(sapNonProdApplyDept.getWeight());
newSapNonProdApplyDept.setSingleThickness(sapNonProdApplyDept.getSingleThickness());
newSapNonProdApplyDept.setKlart(sapNonProdApplyDept.getKlart());
newSapNonProdApplyDept.setClassify(sapNonProdApplyDept.getClassify());
newSapNonProdApplyDept.setMaktxRemEn(sapNonProdApplyDept.getMaktxRemEn());
newSapNonProdApplyDept.setMaktxRemZh(sapNonProdApplyDept.getMaktxRemZh());
newSapNonProdApplyDept.setWerks(sapNonProdApplyDept.getWerks());
newSapNonProdApplyDept.setLgort(sapNonProdApplyDept.getLgort());
newSapNonProdApplyDept.setVkorg(sapNonProdApplyDept.getVkorg());
newSapNonProdApplyDept.setVtweg(sapNonProdApplyDept.getVtweg());
newSapNonProdApplyDept.setLgnum(sapNonProdApplyDept.getLgnum());
newSapNonProdApplyDept.setLgtyp(sapNonProdApplyDept.getLgtyp());
newSapNonProdApplyDept.setMatklName(sapNonProdApplyDept.getMatklName());
newSapNonProdApplyDept.setSpartName(sapNonProdApplyDept.getSpartName());
newSapNonProdApplyDept.setWerksName(sapNonProdApplyDept.getWerksName());
newSapNonProdApplyDept.setLgort(sapNonProdApplyDept.getLgort());
newSapNonProdApplyDept.setLgortName(sapNonProdApplyDept.getLgortName());
newSapNonProdApplyDept.setVkorgName(sapNonProdApplyDept.getVkorgName());
newSapNonProdApplyDept.setVtwegName(sapNonProdApplyDept.getVtwegName());
newSapNonProdApplyDept.setLgnumName(sapNonProdApplyDept.getLgnumName());
newSapNonProdApplyDept.setLgtyp(sapNonProdApplyDept.getLgtyp());
newSapNonProdApplyDept.setLgtypName(sapNonProdApplyDept.getLgtypName());
newSapNonProdApplyDept.setEkgrpName(sapNonProdApplyDept.getEkgrpName());
newSapNonProdApplyDept.setRaubeName(sapNonProdApplyDept.getRaubeName());
newSapNonProdApplyDept.setDispoName(sapNonProdApplyDept.getDispoName());
newSapNonProdApplyDept.setMinbeName(sapNonProdApplyDept.getMinbeName());
newSapNonProdApplyDept.setLadgrName(sapNonProdApplyDept.getLadgrName());
//销售组织
newSapNonProdApplyDept.setMtvfp(sapNonProdApplyDept.getMtvfp());
newSapNonProdApplyDept.setLvorm(sapNonProdApplyDept.getLvorm());
// newSapNonProdApplyDept.setMagrv(sapNonProdApplyDept.getMagrv());
// newSapNonProdApplyDept.setVkorg(sapNonProdApplyDept.getVkorg());
// newSapNonProdApplyDept.setVtweg(sapNonProdApplyDept.getVtweg());
// newSapNonProdApplyDept.setLgnum(sapNonProdApplyDept.getLgnum());
// newSapNonProdApplyDept.setVkorgName(sapNonProdApplyDept.getVkorgName());
// newSapNonProdApplyDept.setVtwegName(sapNonProdApplyDept.getVtwegName());
// newSapNonProdApplyDept.setLgnumName(sapNonProdApplyDept.getLgnumName());
// newSapNonProdApplyDept.setEkgrpName(sapNonProdApplyDept.getEkgrpName());
// newSapNonProdApplyDept.setRaubeName(sapNonProdApplyDept.getRaubeName());
// newSapNonProdApplyDept.setDispoName(sapNonProdApplyDept.getDispoName());
// newSapNonProdApplyDept.setMinbeName(sapNonProdApplyDept.getMinbeName());
// newSapNonProdApplyDept.setLadgrName(sapNonProdApplyDept.getLadgrName());
// 销售组织
// newSapNonProdApplyDept.setVkorg(sapNonProdApplyDept.getVkorg());
// newSapNonProdApplyDept.setVkorgName(sapNonProdApplyDept.getVkorgName());
// newSapNonProdApplyDept.setVtweg(sapNonProdApplyDept.getVtweg());
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java
View file @ c0f7f5e1
......@@ -66,11 +66,8 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
Map<String,Object> map = new HashMap<>();
map.put("result","");
String businessCode=sdo.getString("businessCode");
String baseId=sdo.getString("id");
String genericName=sdo.getString("genericName");
String applyDeptId=sdo.getString("applyDeptId");
Integer active=sdo.getInteger("active");
String meId=sdo.getString("meId");
String opstatus=sdo.getString("opstatus"); //操作状态
NonProdApplyBaseInfo baseInfo=nonProdApplyBaseInfoRepository.findOne(sdo.getString("id"));
String maktx = sdo.getString("maktx");
boolean isSame=false;
......@@ -88,8 +85,15 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
isSame = true;
}
}else {
//如果不是上诉类型的物料，只要查到数据，就存在汉语品名重复
isSame = true;
//没有ID代表新建
if (StringUtil.isBlank(applyDeptId)){
isSame = true;
}else {
//有ID代表已保存的
if (!applyDeptId.equals(sapNonProdApplyDept.getApplyDeptId())){
isSame = true;
}
}
}
}
......@@ -303,6 +307,9 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
if ("0".equals(sapVO.getEkalr())){ //数量结构 传递空
sapVO.setEkalr("");
}
if ("0".equals(sapVO.getLvorm())){//集团级删除 否 传空
sapVO.setLvorm("");
}
if (baseInfo.getBusinessUsage().contains("K")){
sapVO.setPstat(baseInfo.getBusinessUsage());
}else {
......@@ -315,8 +322,12 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
sapVO.setLosgr(applyDept.getPeinh()); //成本核算的价格单位 默认为定价基数
sapVO.setUpdkz("I");//新增
if ("modify".equals(baseInfo.getMaintenanceType()) || "extend".equals(baseInfo.getMaintenanceType())){
if ("modify".equals(baseInfo.getMaintenanceType()) //|| "extend".equals(baseInfo.getMaintenanceType())
){
sapVO.setUpdkz("U");//修改和扩展
if ("X".equals(sapVO.getLvorm())){//修改如果选了集团级删除，传D
sapVO.setUpdkz("D");
}
}
if ("0".equals(sapVO.getInsmk())){
sapVO.setInsmk("");
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyClassVo.java deleted 100644 → 0
View file @ b4f984eb
package com.huigou.topsun.sap.nonProdApply.domain.vo;
import lombok.Data;
import javax.persistence.Column;
@Data
public class NonProdApplyClassVo extends NonProdApplyDeptVo {
/**
* 类型
*/
private String klart;
/**
* 分类
*/
private String classify;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyCostVo.java deleted 100644 → 0
View file @ b4f984eb
package com.huigou.topsun.sap.nonProdApply.domain.vo;
import lombok.Data;
import javax.persistence.Column;
@Data
public class NonProdApplyCostVo extends NonProdApplyDeptVo {
/**
* 数量结构
*/
private String ekalr;
/**
* 不参与成本核算
*/
private String ncost;
/**
* 物料来源
*/
private String hkmat;
/**
* 差异码
*/
private String awsls;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyFinancialVo.java deleted 100644 → 0
View file @ b4f984eb
package com.huigou.topsun.sap.nonProdApply.domain.vo;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import javax.persistence.Column;
@Data
public class NonProdApplyFinancialVo extends NonProdApplyDeptVo {
/**
* 工厂
*/
private String werks;
/**
* 评估分类
*/
private String bklas;
/**
* 价格确定
*/
private String mlast;
/**
* 价格控制
*/
private String vprsv;
/**
* 定价基数
*/
private String peinh;
/**
* 移动平均价
*/
private String verpr;
/**
* 标准价
*/
private String stprs;
/**
* 数量结构
*/
private String ekalr;
/**
* 不参与成本核算
*/
private String ncost;
/**
* 物料来源
*/
private String hkmat;
/**
* 差异码
*/
private String awsls;
//销售评估类
private String eklas;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyMRPVo.java deleted 100644 → 0
View file @ b4f984eb
package com.huigou.topsun.sap.nonProdApply.domain.vo;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import javax.persistence.Column;
@Data
public class NonProdApplyMRPVo extends NonProdApplyDeptVo {
private String werks; //工厂
private String werksName; //工厂
// private String lgort; //库存地点
// private String lgortName; //库存地点
//private String werks; //MRP组
/**
* MRP组
*/
private String disgr;
/**
* MRP类型
*/
private String dismm;
/**
* 重订货点
*/
private String minbe;
/**
* MRP控制者
*/
private String dispo;
/**
* 批量规模
*/
private String disls;
/**
* 固定批量
*/
private String bstfe;
/**
* 最大批量
*/
private String bstma;
/**
* 最小批量
*/
private String bstmi;
/**
* 最大存货水平
*/
private String mabst;
/**
* 设入值
*/
private String bstrf;
/**
* 获取类型
*/
private String beskz;
/**
* 特殊获取方式
*/
private String sobsl;
/**
* 默认生产库存地
*/
private String lgpro;
private String lgproName;
/**
* 倒冲标志
*/
private String rgekz;
/**
* 默认采购收货库存地
*/
private String lgfsb;
private String lgfsbName;
/**
* 收货处理天数
*/
private String webaz;
/**
* 自制时间
*/
private String dzeit;
/**
* 外部采购交货时间
*/
private String plifz;
/**
* 排程边际码
*/
private String fhori;
/**
* 安全库存
*/
private String eisbe;
/**
* 最小安全库存
*/
private String eislo;
/**
* 策略组
*/
private String strgr;
/**
* 可用性检查组
*/
private String mtvfp;
/**
* 补货提前天数
*/
private String wzeit;
/**
* BOM选择方法
*/
private String altsl;
/**
* 独立/集中
*/
private String sbdkz;
/**
* 库存地MRP标识
*/
private String diskz;
/**
* 消耗模式
*/
private String vrmod;
// * 逆推消耗期间
private String vint1;
/**
* 顺推消耗期间
*/
private String vint2;
/**
* 综合MRP
*/
private String miskz;
//期间标识
private String perkz;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyMassVo.java deleted 100644 → 0
View file @ b4f984eb
package com.huigou.topsun.sap.nonProdApply.domain.vo;
import lombok.Data;
import javax.persistence.Column;
@Data
public class NonProdApplyMassVo extends NonProdApplyDeptVo {
/**
* 工厂
*/
private String werks;
/**
* 文档要求
*/
private String kzdkz;
/**
* 检验类型
*/
private String art;
/**
* 激活标识
*/
private String aktiv;
/**
* 过账到质检（质检）
*/
private String insmk;
/**
* 带任务清单检验
*/
private String ppl;
/**
* 自动分配
*/
private String app;
/**
* 检查特性
*/
private String mer;
/**
* 允许略过
*/
private String dyn;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyProduceVo.java deleted 100644 → 0
View file @ b4f984eb
package com.huigou.topsun.sap.nonProdApply.domain.vo;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
@Data
public class NonProdApplyProduceVo extends NonProdApplyDeptVo {
/**
* 投料计量单位
*/
private String ausme;
private String ausmeName;
/**
* 转换分母（生产）
*/
private String umrenProd;
/**
* 转换分子（生产）
*/
private String umrezProd;
/**
* 生产计划参数文件
*/
private String sfcpf;
/**
* 过账到质检
*/
//private String insmk;
//生产主管
private String fevor;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyPurchaseVo.java deleted 100644 → 0
View file @ b4f984eb
package com.huigou.topsun.sap.nonProdApply.domain.vo;
import lombok.Data;
import javax.persistence.Column;
@Data
public class NonProdApplyPurchaseVo extends NonProdApplyDeptVo {
/**
* 采购计量单位
*/
private String bstme;
private String bstmeName;
/**
* 转换分母（采购）
*/
private String umrenPurch;
/**
* 转换分子（采购）
*/
private String umrezPurch;
/**
* 默认采购组
*/
private String ekgrp;
private String ekgrpName;
/**
* MPN参数
*/
private String mprof;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplySaleVo.java deleted 100644 → 0
View file @ b4f984eb
package com.huigou.topsun.sap.nonProdApply.domain.vo;
import lombok.Data;
import javax.persistence.Column;
@Data
public class NonProdApplySaleVo extends NonProdApplyDeptVo {
/**
* 销售组织
*/
private String vkorg;
/**
* 分销渠道
*/
private String vtweg;
/**
* 销售计量单位
*/
private String vrkme;
/**
* 销售计量单位转换分母
*/
private String umrenSale;
/**
* 销售计量单位转换分子
*/
private String umrezSale;
/**
* 转换分母
*/
private String umren;
/**
* 转换分子
*/
private String umrez;
/**
* 交货工厂
*/
private String dwerk;
/**
* 税收发运国
*/
private String aland;
/**
* 税分类
*/
private String taxkm;
/**
* 统计组
*/
private String versg;
/**
* 物料定价组
*/
private String kondm;
/**
* 会计科目组
*/
private String ktgrm;
/**
* 产品层级
*/
private String prodh;
/**
* 版式
*/
private String mvgr1;
/**
* 品牌
*/
private String mvgr2;
/**
* 用途
*/
private String mvgr3;
/**
* 备用
*/
private String mvgr4;
/**
* 备用
*/
private String mvgr5;
/**
* 销售项次组
*/
private String mtpos;
/*
*批次管理
*/
private String xchpf;
/**
* 运输组
*/
private String tragr;
/**
* 装载组
*/
private String ladgr;
private String dwerkName;
private String alandName;
private String vrkmeName;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyStoreVo.java deleted 100644 → 0
View file @ b4f984eb
package com.huigou.topsun.sap.nonProdApply.domain.vo;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import javax.persistence.Column;
@Data
public class NonProdApplyStoreVo extends NonProdApplyDeptVo {
/**
* 工厂（质检）
*/
private String werks;
/**
* 库存地点（质检）
*/
private String lgortQm;
private String lgortQmName;
/**
* 序列号参数
*/
private String sernp;
/**
* 序列号水平
*/
private String serlv;
/**
* 利润中心
*/
private String prctr;
/**
* 过账到质检
*/
private String insmk;
//过期日期
private String sledBbd;
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyWarehouseVo.java deleted 100644 → 0
View file @ b4f984eb
package com.huigou.topsun.sap.nonProdApply.domain.vo;
import lombok.Data;
import javax.persistence.Column;
@Data
public class NonProdApplyWarehouseVo extends NonProdApplyDeptVo {
/**
* 工厂（利润中心）
*/
private String werks;
/**
* 库存地点
*/
// private String lgort;
// private String lgortName;
private String lgortProfit;
private String lgortProfitName;
/**
* 仓库号
*/
private String lgnum;
/**
* 存储类型
*/
private String lgtyp;
private String lgtypName;
/**
* 存货下架存储类型
*/
private String ltkza;
private String ltkzaName;
/**
* 存货上架存储类型
*/
private String ltkze;
private String ltkzeName;
/**
* 存储分区标识
*/
private String lgbkz;
private String lgbkzName;
/**
* 仓库设施1存储数量
*/
private String lhmg1;
/**
* 仓库设施1存储单位
*/
private String lhme1;
private String lhme1Name;
/**
* 仓库设施1类型
*/
private String lety1;
}
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