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

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/materialApplyNext.js

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

-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

-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/NonProdApplyDeptBaseInfoVo.java

+package com.huigou.topsun.sap.nonProdApply.domain.vo;
+
+import lombok.Data;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 
+ * @TableName sap_non_prod_apply_dept
+ */
+@Data
+public class NonProdApplyDeptBaseInfoVo implements Serializable {
+
+    /**
+     * 物料编码
+     */
+    private String matnr;
+
+    //行业
+    private String mbrsh;
+
+    /**
+     * 物料类型
+     */
+    private String mtart;
+
+    /**
+     * 物料组
+     */
+    private String matkl;
+
+    /**
+     * 集团删除
+     */
+    private String lvorm;
+
+    /**
+     * 产品组
+     */
+    private String spart;
+
+    /**
+     * 一般销售项次组
+     */
+    private String mtposMara;
+
+    /**
+     * 汉语品名
+     */
+    private String maktx;
+
+    /**
+     * 汉语语言
+     */
+    private String spars;
+
+    /**
+     * 英语品名
+     */
+    private String maktxEn;
+
+    /**
+     * 英语语言码
+     */
+    private String sparsEn;
+
+    /**
+     * 适用标准
+     */
+    private String normt;
+
+
+    /**
+     * 尺寸
+     */
+    private String groes;
+
+    /**
+     * 批次管理
+     */
+    private String xchpf;
+
+    /**
+     * 包装物料组
+     */
+    private String magrv;
+
+    /**
+     * 基本计量单位
+     */
+    private String meins;
+    private String meinsName;
+
+    /**
+     * 毛重
+     */
+    private String brgew;
+
+    /**
+     * 净重
+     */
+    private String ntgew;
+
+    /**
+     * 重量单位
+     */
+    private String gewei;
+
+    /**
+     * 体积
+     */
+    private String volum;
+
+    /**
+     * 体积单位
+     */
+    private String voleh;
+
+    /**
+     * 存储条件
+     */
+    private String raube;
+
+    /**
+     * 有效期标识
+     */
+    private String iprkz;
+
+    /**
+     * 最小货架寿命
+     */
+    private String mhdrz;
+
+    /**
+     * 总有效期
+     */
+    private String mhdhb;
+
+    /**
+     * 类型
+     */
+    private String klart;
+
+    /**
+     * 分类
+     */
+    private String classify;
+
+
+    /**
+     * 交货工厂
+     */
+    @Column(name = "DWERK")
+    private String dwerk;
+
+    @Column(name = "DWERK_NAME")
+    private String dwerkName;
+    /**
+     * 税收发运国
+     */
+    @Column(name = "ALAND")
+    private String aland;
+
+    @Column(name = "ALAND_NAME")
+    private String alandName;
+    /**
+     * 税分类
+     */
+    @Column(name = "TAXKM")
+    private String taxkm;
+
+    /**
+     * 统计组
+     */
+    @Column(name = "VERSG")
+    private String versg;
+
+    /**
+     * 物料定价组
+     */
+    @Column(name = "KONDM")
+    private String kondm;
+
+    /**
+     * 会计科目组
+     */
+    @Column(name = "KTGRM")
+    private String ktgrm;
+
+    /**
+     * 产品层级
+     */
+    @Column(name = "PRODH")
+    private String prodh;
+
+    /**
+     * 版式
+     */
+    @Column(name = "MVGR1")
+    private String mvgr1;
+
+    /**
+     * 品牌
+     */
+    @Column(name = "MVGR2")
+    private String mvgr2;
+
+    /**
+     * 用途
+     */
+    @Column(name = "MVGR3")
+    private String mvgr3;
+
+    /**
+     * 备用
+     */
+    @Column(name = "MVGR4")
+    private String mvgr4;
+
+    /**
+     * 备用
+     */
+    @Column(name = "MVGR5")
+    private String mvgr5;
+
+    /**
+     * 销售项次组
+     */
+    @Column(name = "MTPOS")
+    private String mtpos;
+
+    /**
+     * 运输组
+     */
+    @Column(name = "TRAGR")
+    private String tragr;
+
+    /**
+     * 装载组
+     */
+    @Column(name = "LADGR")
+    private String ladgr;
+
+    /**
+     * 工厂
+     */
+    @Column(name = "WERKS")
+    private String werks;
+
+    /**
+     * 采购计量单位
+     */
+    @Column(name = "BSTME")
+    private String bstme;
+
+    @Column(name = "bstme_name")
+    private String bstmeName;
+
+    /**
+     * 转换分母（采购）
+     */
+    @Column(name = "UMREN_PURCH")
+    private String umrenPurch;
+
+    /**
+     * 转换分子（采购）
+     */
+    @Column(name = "UMREZ_PURCH")
+    private String umrezPurch;
+
+    /**
+     * 默认采购组
+     */
+    @Column(name = "EKGRP")
+    private String ekgrp;
+
+    /**
+     * MPN参数
+     */
+    @Column(name = "MPROF")
+    private String mprof;
+
+    /**
+     * 工厂（采购）
+     */
+    @Column(name = "WERKS_PURCH")
+    private String werksPurch;
+
+    /**
+     * 库存地点
+     */
+    @Column(name = "LGORT")
+    private String lgort;
+
+    /**
+     * MRP组
+     */
+    @Column(name = "DISGR")
+    private String disgr;
+
+    /**
+     * MRP类型
+     */
+    @Column(name = "DISMM")
+    private String dismm;
+
+    /**
+     * 重订货点
+     */
+    @Column(name = "MINBE")
+    private String minbe;
+
+    /**
+     * MRP控制者
+     */
+    @Column(name = "DISPO")
+    private String dispo;
+
+    /**
+     * 批量规模
+     */
+    @Column(name = "DISLS")
+    private String disls;
+
+    /**
+     * 固定批量
+     */
+    @Column(name = "BSTFE")
+    private String bstfe;
+
+    /**
+     * 最大批量
+     */
+    @Column(name = "BSTMA")
+    private String bstma;
+
+    /**
+     * 最小批量
+     */
+    @Column(name = "BSTMI")
+    private String bstmi;
+
+    /**
+     * 最大存货水平
+     */
+    @Column(name = "MABST")
+    private String mabst;
+
+    /**
+     * 设入值
+     */
+    @Column(name = "BSTRF")
+    private String bstrf;
+
+    /**
+     * 获取类型
+     */
+    @Column(name = "BESKZ")
+    private String beskz;
+
+    /**
+     * 特殊获取方式
+     */
+    @Column(name = "SOBSL")
+    private String sobsl;
+
+    /**
+     * 默认生产库存地
+     */
+    @Column(name = "LGPRO")
+    private String lgpro;
+    @Column(name = "lgpro_name")
+    private String lgproName;
+
+    /**
+     * 倒冲标志
+     */
+    @Column(name = "RGEKZ")
+    private String rgekz;
+
+    /**
+     * 默认采购收货库存地
+     */
+    @Column(name = "LGFSB")
+    private String lgfsb;
+
+    @Column(name = "lgfsb_name")
+    private String lgfsbName;
+
+    /**
+     * 收货处理天数
+     */
+    @Column(name = "WEBAZ")
+    private String webaz;
+
+    /**
+     * 自制时间
+     */
+    @Column(name = "DZEIT")
+    private String dzeit;
+
+    /**
+     * 外部采购交货时间
+     */
+    @Column(name = "PLIFZ")
+    private String plifz;
+
+    /**
+     * 排程边际码
+     */
+    @Column(name = "FHORI")
+    private String fhori;
+
+    /**
+     * 安全库存
+     */
+    @Column(name = "EISBE")
+    private String eisbe;
+
+    /**
+     * 最小安全库存
+     */
+    @Column(name = "EISLO")
+    private String eislo;
+
+    /**
+     * 策略组
+     */
+    @Column(name = "STRGR")
+    private String strgr;
+
+    /**
+     * 可用性检查组
+     */
+    @Column(name = "MTVFP")
+    private String mtvfp;
+
+    /**
+     * 补货提前天数
+     */
+    @Column(name = "WZEIT")
+    private String wzeit;
+
+    /**
+     * BOM选择方法
+     */
+    @Column(name = "ALTSL")
+    private String altsl;
+
+    /**
+     * 独立/集中
+     */
+    @Column(name = "SBDKZ")
+    private String sbdkz;
+
+    /**
+     * 库存地MRP标识
+     */
+    @Column(name = "DISKZ")
+    private String diskz;
+
+    /**
+     * 投料计量单位
+     */
+    @Column(name = "AUSME")
+    private String ausme;
+    @Column(name = "ausme_name")
+    private String ausmeName;
+
+    /**
+     * 转换分母（生产）
+     */
+    @Column(name = "UMREN_PROD")
+    private String umrenProd;
+
+    /**
+     * 转换分子（生产）
+     */
+    @Column(name = "UMREZ_PROD")
+    private String umrezProd;
+
+    /**
+     * 生产计划参数文件
+     */
+    @Column(name = "SFCPF")
+    private String sfcpf;
+
+    /**
+     * 过账到质检
+     */
+    @Column(name = "INSMK")
+    private String insmk;
+
+    /**
+     * 工厂（质检）
+     */
+    @Column(name = "WERKS_QM")
+    private String werksQm;
+
+    /**
+     * 库存地点（存储）
+     */
+    @Column(name = "LGORT_QM")
+    private String lgortQm;
+
+    @Column(name = "LGORT_QM_NAME")
+    private String lgortQmName;
+    /**
+     * 序列号参数
+     */
+    @Column(name = "SERNP")
+    private String sernp;
+
+    /**
+     * 序列号水平
+     */
+    @Column(name = "SERLV")
+    private String serlv;
+
+    /**
+     * 利润中心
+     */
+    @Column(name = "PRCTR")
+    private String prctr;
+
+    /**
+     * 工厂（利润中心）
+     */
+    @Column(name = "WERKS_PROFIT")
+    private String werksProfit;
+
+    /**
+     * 库存地点（仓库）
+     */
+    @Column(name = "LGORT_PROFIT")
+    private String lgortProfit;
+
+    @Column(name = "LGORT_PROFIT_NAME")
+    private String lgortProfitName;
+    /**
+     * 仓库号
+     */
+    @Column(name = "LGNUM")
+    private String lgnum;
+
+    /**
+     * 存储类型
+     */
+    @Column(name = "LGTYP")
+    private String lgtyp;
+
+    /**
+     * 存货下架存储类型
+     */
+    @Column(name = "LTKZA")
+    private String ltkza;
+
+    @Column(name = "ltkza_name")
+    private String ltkzaName;
+
+    /**
+     * 存货上架存储类型
+     */
+    @Column(name = "LTKZE")
+    private String ltkze;
+
+    @Column(name = "ltkze_name")
+    private String ltkzeName;
+
+    /**
+     * 存储分区标识
+     */
+    @Column(name = "LGBKZ")
+    private String lgbkz;
+
+    @Column(name = "lgbkz_name")
+    private String lgbkzName;
+
+    /**
+     * 仓库设施1存储数量
+     */
+    @Column(name = "LHMG1")
+    private String lhmg1;
+
+    /**
+     * 仓库设施1存储单位
+     */
+    @Column(name = "LHME1")
+    private String lhme1;
+
+    @Column(name = "lhme1_name")
+    private String lhme1Name;
+
+    /**
+     * 仓库设施1类型
+     */
+    @Column(name = "LETY1")
+    private String lety1;
+
+    /**
+     * 工厂（文档要求）
+     */
+    @Column(name = "WERKS_DOC")
+    private String werksDoc;
+
+    /**
+     * 文档要求
+     */
+    @Column(name = "KZDKZ")
+    private String kzdkz;
+
+    /**
+     * 检验类型
+     */
+    @Column(name = "ART")
+    private String art;
+
+    /**
+     * 激活标识
+     */
+    @Column(name = "AKTIV")
+    private String aktiv;
+
+    /**
+     * 过账到质检（质检）
+     */
+    @Column(name = "INSMK_QM")
+    private String insmkQm;
+
+    /**
+     * 带任务清单检验
+     */
+    @Column(name = "PPL")
+    private String ppl;
+
+    /**
+     * 自动分配
+     */
+    @Column(name = "APP")
+    private String app;
+
+    /**
+     * 检查特性
+     */
+    @Column(name = "MER")
+    private String mer;
+
+    /**
+     * 允许略过
+     */
+    @Column(name = "DYN")
+    private String dyn;
+
+    /**
+     * 工厂（评估分类）
+     */
+    @Column(name = "BWKEY")
+    private String bwkey;
+
+    /**
+     * 评估分类
+     */
+    @Column(name = "BKLAS")
+    private String bklas;
+
+    /**
+     * 价格确定
+     */
+    @Column(name = "MLAST")
+    private String mlast;
+
+    /**
+     * 价格控制
+     */
+    @Column(name = "VPRSV")
+    private String vprsv;
+
+    /**
+     * 定价基数
+     */
+    @Column(name = "PEINH")
+    private String peinh;
+
+    /**
+     * 移动平均价
+     */
+    @Column(name = "VERPR")
+    private String verpr;
+
+    /**
+     * 标准价
+     */
+    @Column(name = "STPRS")
+    private String stprs;
+
+    /**
+     * 数量结构
+     */
+    @Column(name = "EKALR")
+    private String ekalr;
+
+    /**
+     * 不参与成本核算
+     */
+    @Column(name = "NCOST")
+    private String ncost;
+
+    /**
+     * 物料来源
+     */
+    @Column(name = "HKMAT")
+    private String hkmat;
+
+    /**
+     * 差异码
+     */
+    @Column(name = "AWSLS")
+    private String awsls;
+
+
+    /**
+     * 消耗模式
+     */
+    @Column(name = "VRMOD")
+    private String vrmod;
+
+    /**
+     * 逆推消耗期间
+     */
+    @Column(name = "VINT1")
+    private String vint1;
+
+    /**
+     * 顺推消耗期间
+     */
+    @Column(name = "VINT2")
+    private String vint2;
+
+
+    /**
+     * 综合MRP
+     */
+    @Column(name = "MISKZ")
+    private String miskz;
+
+
+    //期间标识
+    @Column(name = "PERKZ")
+    private String perkz;
+
+    //生产主管
+    @Column(name = "FEVOR")
+    private String fevor;
+
+
+    //过期日期
+    @Column(name = "SLED_BBD")
+    private String sledBbd;
+
+
+    //销售评估类
+    @Column(name = "EKLAS")
+    private String eklas;
+
+    /**
+     * 维护状态（0草稿；1保存；2分发）
+     */
+    @Column(name = "STATUS")
+    private String status;
+
+    @Column(name = "matkl_name")
+    private String matklName;
+
+    @Column(name = "spart_name")
+    private String spartName;
+
+    @Column(name = "werks_name")
+    private String werksName;
+
+    @Column(name = "lgort_name")
+    private String lgortName;
+
+    @Column(name = "vkorg_name")
+    private String vkorgName;
+
+    @Column(name = "vtweg_name")
+    private String vtwegName;
+
+    @Column(name = "lgnum_name")
+    private String lgnumName;
+
+    @Column(name = "lgtyp_name")
+    private String lgtypName;
+
+    @Column(name = "ekgrp_name")
+    private String ekgrpName;
+
+    @Column(name = "raube_name")
+    private String raubeName;
+
+    @Column(name = "dispo_name")
+    private String dispoName;
+
+    @Column(name = "minbe_name")
+    private String minbeName;
+
+    @Column(name = "ladgr_name")
+    private String ladgrName;
+
+    @Column(name = "vrkme_name")
+    private String vrkmeName;
+
+//    @Column(name = "sfcpf_name")
+//    private String sfcpfName;
+
+    @Column(name = "fevor_name")
+    private String fevorName;
+
+    @Transient
+    private String billCode;
+    @Transient
+    private Integer statusId;
+    @Transient
+    private String personMemberName;
+    @Transient
+    private Date fillinDate;
+    @Transient
+    private String maintenanceType;
+    @Transient
+    private String businessUsage;
+    @Transient
+    private String businessCode;
+    @Transient
+    private String id; //baseInfoId
+
+    //物品总属性
+    @Transient
+    private String genericName;
+    @Transient
+    private String applicableStandard;
+    @Transient
+    private String  baseUnit;
+    @Transient
+    private String specifications;
+    @Transient
+    private String material;
+    @Transient
+    private String design;
+    @Transient
+    private String  size;
+    @Transient
+    private String  brand;
+    @Transient
+    private String  brandName;
+    @Transient
+    private String materialUsage;
+    @Transient
+    private String itemAttributes;
+    @Transient
+    private Integer distribute;
+    @Transient
+    private String kind;
+
+    @Transient
+    private String maktxRemZh;
+    @Transient
+    private String maktxRemEn;
+    @Transient
+    private String textDescription;
+    @Transient
+    private String baseUnitName;
+
+    @Transient
+    private Date createdDate;
+
+    /**
+     *EP BOM原材料信息
+     */
+    //长度cm
+    @Column(name = "length")
+    private BigDecimal length;
+
+    //宽度cm
+    @Column(name = "width_cm")
+    private BigDecimal widthCm;
+
+    //厚度cm
+    @Column(name = "thickness")
+    private BigDecimal thickness;
+
+    //克重g
+    @Column(name = "weight")
+    private BigDecimal weight;
+
+    //单层厚
+    @Column(name = "single_thickness")
+    private BigDecimal singleThickness;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyFinancialVo.java

-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

-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

-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

-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

-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

-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

-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

-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;
-
-}