物料主数据的调整

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

@@ -14,7 +14,7 @@ function loadNonProdApplyListGrid() {
             addHandler()
         },
         deleteHandler: deleteHandler,
-        testHandler: {id: 'basicInfoMaintenance', text: '基本信息维护', img: 'fa-music', className: 'btn-gray',
+        testHandler: {id: 'basicInfoMaintenance', text: '信息填报', img: 'fa-music', className: 'btn-gray',
             click: function () {
 
                 let result=DataUtil.getUpdateRow(gridManager);
@@ -42,7 +42,7 @@ function loadNonProdApplyListGrid() {
                     Public.tip("请选择一条已审核后数据！")
                     return false;
                 }
-                if(result.distribute!==3){
+                if(result.distribute!==2){
                     Public.tip("请选择一条已办结的数据！")
                     return false;
                 }
@@ -58,7 +58,7 @@ function loadNonProdApplyListGrid() {
                     Public.tip("请选择一条已审核后数据！")
                     return false;
                 }
-                if(result.distribute!==3){
+                if(result.distribute!==2){
                     Public.tip("请选择一条已办结的数据！")
                     return false;
                 }
@@ -96,17 +96,14 @@ function loadNonProdApplyListGrid() {
             {display: "物料/产品编码", name: "matnr", width: 150, minWidth: 60, type: "string", align: "left"},
             {display: "维护类型", name: "maintenanceTypeTextView", width: 130, minWidth: 60, type: "string", align: "left",
                 render:function(item){
-                    var result = item.maintenanceTypeTextView+"-待处理基本信息";
+                    var result = item.maintenanceTypeTextView+"-待填报";
                     if (item.status=="1"){
                         result=item.maintenanceTypeTextView+"-待审批";
                      }
                     if (item.distribute == "1"){
-                        result=item.maintenanceTypeTextView+"-待分发";
+                        result=item.maintenanceTypeTextView+"-待确认";
                     }
                     if (item.distribute == "2"){
-                        result=item.maintenanceTypeTextView+"-待业务处理";
-                    }
-                    if (item.distribute == "3"){
                         result=item.maintenanceTypeTextView+"-已办结";
                     }
                     return result;

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/NonProdApplyApplication.java

@@ -35,4 +35,6 @@ public interface NonProdApplyApplication{
 
      //保存来自SAP的产品申请
      String saveProdApplyFromSapVO(ProdApplyFromSapVO prodApplyFromSapVO);
+
+    Map<String, Object> slicedNonApplyBaseInfoByMaktx(NonProdApplyBaseInfoQueryRequest query);
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/NonProdApplyDeptApplication.java

@@ -48,4 +48,7 @@ public interface NonProdApplyDeptApplication {
     void saveDeptStaff(List<Map<String, String>> deptStaffList,String bussinessId,String genericName);
     //保存待办消息
     void saveBsnMessageData(NonProdApplyBaseInfo baseInfo,Map<String,Object> backMap);
+
+    //领导确认
+    Map<String,Object> confirmNonProdApplyDept(SDO sdo);
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java

@@ -123,6 +123,9 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
                 newSapNonProdApplyDept.setXchpf(sapNonProdApplyDept.getXchpf());
                 newSapNonProdApplyDept.setMagrv(sapNonProdApplyDept.getMagrv());
                 newSapNonProdApplyDept.setMeins(sapNonProdApplyDept.getMeins());
+                newSapNonProdApplyDept.setMeinsName(sapNonProdApplyDept.getMeinsName());
+                newSapNonProdApplyDept.setGroes(sapNonProdApplyDept.getGroes());
+
                 newSapNonProdApplyDept.setBrgew(sapNonProdApplyDept.getBrgew());
                 newSapNonProdApplyDept.setNtgew(sapNonProdApplyDept.getNtgew());
                 newSapNonProdApplyDept.setGewei(sapNonProdApplyDept.getGewei());
@@ -228,6 +231,7 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
                 Map backMap=new HashMap();
                 backMap.put("TYPE","C");
                 backMap.put("title",nonProdApplyBaseInfo.getBillCode());
+                backMap.put("positionCode","HYZY");
                 nonProdApplyDeptApplication.saveBsnMessageData(nonProdApplyBaseInfo,backMap);
             }
        // }
@@ -531,6 +535,18 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
         return this.sqlExecutorDao.executeSlicedQuery(model);
     }
 
+  //按汉语品名查询数据
+  @Override
+    public  Map<String, Object> slicedNonApplyBaseInfoByMaktx(NonProdApplyBaseInfoQueryRequest query){
+
+        QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedNonApplyBaseInfoByMaktx");
+        QueryModel model = this.sqlExecutorDao.getQueryModel(queryDescriptor, query);
+        model.setPageIndex(1);
+        model.setPageSize(100);
+        return this.sqlExecutorDao.executeSlicedQuery(model);
+    }
+
+
     @Override
     //获取变更或扩展前的业务部门
    public  String getChangeBusinessUsage(String bizId,String type){

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyNextController.java

@@ -135,9 +135,9 @@ public class NonProdApplyNextController extends CommonController {
            // this.putAttribute("businessUsageSeledList",mapTmp);
            // this.putAttribute("businessUsageUnSeledList",unMapTmp);
         }
-        int slen=1;
+        int slen=0;
         if (StringUtil.isNotBlank(nonProdApplyBaseInfo.getBusinessUsage())){
-            slen=nonProdApplyBaseInfo.getBusinessUsage().split(",").length+1;
+            slen=nonProdApplyBaseInfo.getBusinessUsage().split(",").length;
         }
         this.putAttribute("busiLens",slen);
         if (nonProdApplyDept != null) {
@@ -218,10 +218,26 @@ public class NonProdApplyNextController extends CommonController {
      */
     public String saveSapNonProdApplyDept() {
         SDO sdo = this.getSDO();
+        if (StringUtil.isNotBlank(sdo.getString("maktx"))) {
+            NonProdApplyBaseInfoQueryRequest query = new NonProdApplyBaseInfoQueryRequest();
+            query.setMaktx(sdo.getString("maktx"));
+            Map<String, Object> map=nonProdApplyApplication.slicedNonApplyBaseInfoByMaktx(query);
+            List <Map <String,Object>>baseList=(List)map.get("Rows");
+            sdo.putProperty("baseList",baseList);
+        }
         Map<String, Object> map = nonProdApplyDeptApplication.saveSapNonProdApplyDept(sdo);
         return toResult(map);
     }
 
+    /**
+     * 领导确认和回退
+     */
+    public String confirmSapNonProdApplyDept() {
+        SDO sdo = this.getSDO();
+        Map<String, Object> map = nonProdApplyDeptApplication.confirmNonProdApplyDept(sdo);
+        return toResult(map);
+    }
+
 
     /**
      * 分发表单

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/NonProdApplyBaseInfo.java

@@ -145,7 +145,7 @@ public class NonProdApplyBaseInfo extends FlowBillAbstractEntity {
     @Column(name = "kind")
     private String kind;
 
-   //处理状态：  0 待分发 1 基本信息填写  2 已分发  3  已办结
+   //处理状态：  0 待提交 1 待领导确认 2 已办结
     @Column(name = "distribute")
     private Integer distribute;
 

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

@@ -148,8 +148,6 @@ public class NonProdApplyBasicVo extends NonProdApplyDeptVo {
 
     private String lgtypName;
 
-    private String ekgrpName;
-
     /**
      * 类型
      */
@@ -160,16 +158,508 @@ public class NonProdApplyBasicVo extends NonProdApplyDeptVo {
      */
     private String classify;
 
-    private String lhme1Name;
-    private String lgbkzName;
-    private String ltkzeName;
-    private String ltkzaName;
-    private String bstmeName;
     private String meinsName;
-    private String lgproName;
-
     private String groes;
-
     private String maktxRemZh;
     private String maktxRemEn;
+
+//销售视图字段=============================================================-----------
+    /**
+     * 销售组织
+     */
+   // 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;
+
+// 采购=======================================----------------------------------
+    /**
+     * 采购计量单位
+     */
+    private String bstme;
+    private String bstmeName;
+
+    /**
+     * 转换分母（采购）
+     */
+    private String umrenPurch;
+
+    /**
+     * 转换分子（采购）
+     */
+    private String umrezPurch;
+
+    /**
+     * 默认采购组
+     */
+    private String ekgrp;
+    private String ekgrpName;
+
+    /**
+     * MPN参数
+     */
+    private String mprof;
+
+// MRP=======================================----------------------------------
+
+    // 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;
+
+  //生产====================================================---------------
+    /**
+     * 投料计量单位
+     */
+    private String ausme;
+    private String ausmeName;
+
+    /**
+     * 转换分母（生产）
+     */
+    private String umrenProd;
+
+    /**
+     * 转换分子（生产）
+     */
+    private String umrezProd;
+
+    /**
+     * 生产计划参数文件
+     */
+    private String sfcpf;
+
+    /**
+     * 过账到质检
+     */
+    //private String insmk;
+
+    //生产主管
+    private String fevor;
+
+    //存储管理==============================================
+
+
+    /**
+     * 库存地点（质检）
+     */
+
+
+    private String lgortQm;
+
+    private String lgortQmName;
+    /**
+     * 序列号参数
+     */
+    private String sernp;
+
+    /**
+     * 序列号水平
+     */
+    private String serlv;
+
+    /**
+     * 利润中心
+     */
+    private String prctr;
+
+    /**
+     * 过账到质检
+     */
+    private String insmk;
+
+    //过期日期
+    private String sledBbd;
+
+    //仓库管理==========================================================================================
+    /**
+     * 工厂（利润中心）
+     */
+    /**
+     * 库存地点
+     */
+    // 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;
+    //财务核算==========================================================================================
+    /**
+     * 评估分类
+     */
+
+    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/repository/NonProdApplyBaseInfoRepository.java

@@ -10,4 +10,5 @@ import java.util.List;
 public interface NonProdApplyBaseInfoRepository extends JpaRepository<NonProdApplyBaseInfo,String> {
 
     List<NonProdApplyBaseInfo> findByGenericNameAndMaintenanceType(String genericName,String maintenanceType);
+
 }

topsun/src/main/resources/config/topsun/sap/nonProdApply/nonProdApplyBaseInfo.xml

@@ -20,4 +20,11 @@
         </sql-query>
         <!--condition column="matnr" name="matnr" type="java.lang.String" symbol="=" alias="t"/-->
     </query>
+    <query name="slicedNonApplyBaseInfoByMaktx" label="按汉语品名查询所有数据" table="sap_non_prod_apply_base_info">
+        <sql-query>
+            select  id,source_id,maintenance_type,fillin_date from sap_non_prod_apply_base_info t where t.id in (
+            select  base_info_id from sap_non_prod_apply_dept snpad where  MAKTX=:maktx) and t.status!=5 order by fillin_date asc
+        </sql-query>
+        <!--condition column="matnr" name="matnr" type="java.lang.String" symbol="=" alias="t"/-->
+    </query>
 </query-mappings>
\ No newline at end of file