物料主数据的页面逻辑调整

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

@@ -20,12 +20,29 @@ function initializate() {
     coRowNum= $("#busiLens").val();
     $("#klart").val("023")
     $("#classify").val("Z_YCL")
-    //alert($("#active").val());
     //页面控制
     UICtrl.enable($("#businessUsage"));
     UICtrl.enable($("#matklName"));
-
-
+    //物品类型 控制存储的序列号参数
+    $("#mtart").combox({onChange:function(data) {
+         storeDisplaySer(data.value);
+      }
+    });
+    //价格控制  控制财务核算的 不参与成本核算
+    $("#vprsv").combox({onChange:function(data) {
+          financialDisplayNcost(data.value);
+        }
+    });
+    //获取类型   控制财务核算的 不参与成本核算
+    $("#beskz").combox({onChange:function(data) {
+            financialDisplayNcost($("#vprsv").val());
+        }
+    });
+    //特殊获取方式  价格控制  控制财务核算的 不参与成本核算
+    $("#sobsl").combox({onChange:function(data) {
+          financialDisplayNcost($("#vprsv").val());
+       }
+    });
     switch ($("#active").val()) {
         case '0'://待填报
           //  $("#businessUsageDiv").hide();
@@ -115,13 +132,13 @@ function initializate() {
         if ($(this).is(':checked')) {
              //let datas=gridManager.getData();
              var name="",deptCode="";
-            for (var u=0;u<dictUsage.length;u++){
+           /* for (var u=0;u<dictUsage.length;u++){
                 if ($(this).val()==dictUsage[u].split(",")[0]){
                     name=dictUsage[u].split(",")[1];
                     deptCode=dictUsage[u].split(",")[0];
                     break;
                 }
-            }
+            } */
            /* let isExist=0;
             for (var i=0;i<datas.length;i++) {
                 if (datas[i].deptCode==deptCode){
@@ -139,7 +156,7 @@ function initializate() {
            // debugger
            // alert(datas.length);alert(dictUsage.length)
             if (coRowNum==dictUsage.length){
-               $('input[name="isAll"]')[0].checked = true;
+              $('input[name="isAll"]')[0].checked = true;
             }
         } else {
             // let datas=gridManager.getData();
@@ -160,47 +177,46 @@ function initializate() {
 }
 
 function  showBusiness(busiCode) {
-    if (busiCode=="V") {
+    if (busiCode=="V") {  //销售
         $("#saleDiv").show();
         saleMustInput(true);
     }
-    if (busiCode=="E") {
+    if (busiCode=="E") { //采购
         $("#purchaseDiv").show();
         purchaseMustInput(true);
     }
-    if (busiCode=="D")  {
+    if (busiCode=="D")  { //MRP
         $("#mrpDiv").show();
         $("#dismm").combox({onChange:function(data) {
-                if (data.value=='ND'){
-                    mrpMustInput(false);
-                } else {
-                    mrpMustInput(true);
-                }
-
+             if (data.value=='ND'){
+                  mrpMustInput(false);
+              } else {
+                  mrpMustInput(true);
+              }
             }
         });
         UICtrl.setElRequiredFlag("#dismm",true);
     }
-    if (busiCode=="A")  {
+
+    if (busiCode=="A")  { //生产
         $("#produceDiv").show();
         produceMustInput(true);
     }
-    if (busiCode=="L")  {
+    if (busiCode=="L")  {  //存储
         $("#storeDiv").show();
         storeMustInput(true);
     }
-    if (busiCode=="S")   {
+    if (busiCode=="S")   { // 仓库
         $("#warehouseDiv").show();
         warehouseMustInput(true);
     }
-    if (busiCode=="B")  {
+    if (busiCode=="B")  { //财务
         $("#financialDiv").show();
         financialMustInput(true);
     }
 }
 
 function  hideBusiness(busiCode) {
-
     if (busiCode=="E") {
         $("#purchaseDiv").hide();
         saleMustInput(false);
@@ -216,7 +232,6 @@ function  hideBusiness(busiCode) {
     if (busiCode=="A") {
         $("#produceDiv").hide();
         produceMustInput(false);
-
     }
     if (busiCode=="L") {
         $("#storeDiv").hide();
@@ -243,7 +258,7 @@ function  showAllBusiness() {
     saleMustInput(true);
     purchaseMustInput(true);
    // mrpMustInput(true);
-    UICtrl.setElRequiredFlag("#dismm",true);
+    UICtrl.setElRequiredFlag("#dismm",true); //MRP类型
     storeMustInput(true);
     warehouseMustInput(true);
     financialMustInput(true);
@@ -293,10 +308,11 @@ function viewOnly(){ //只能查看
       hideAllBusiness();
     for (var x=0;x<$("input[name='businessUsage']").length;x++) {
         if ($("input[name='businessUsage']")[x].checked) {
-            showBusinessReadOnly($("input[name='businessUsage']")[x].value);
+          showBusinessReadOnly($("input[name='businessUsage']")[x].value);
         }
     }
     UICtrl.setDisable("#basicInfoDiv");
+    UICtrl.setDisable("#distributeDiv");
     $("#maktxRemZh").attr("readonly",true);
     $("#maktxRemEn").attr("readonly",true);
     //UICtrl.setDisable($("#businessUsageV"));
@@ -344,6 +360,34 @@ function produceMustInput(flag){
 }
 function  storeMustInput(flag) {
     UICtrl.setElRequiredFlag("#prctr",flag);
+    storeDisplaySer($('#mtart').val());
+}
+function storeDisplaySer(mtart){
+    if (mtart=='ZGMB'){
+        $('#sernp').val('Z005');
+        $('#sernp_text').val('刀工模版采购序列号参数');
+        $('#serlv').val('1');
+        $('#serlv_text').val('保持设备号和序列号同步');
+        $("#sernp_text").attr("disabled", false);
+        $("#serlv_text").attr("disabled", false);
+        $("#sernp").attr("disabled", false);
+        $("#serlv").attr("disabled", false);
+
+        $("#sernp_text").next().find("button").attr("disabled",false);
+        $("#serlv_text").next().find("button").attr("disabled",false);
+    } else {
+        $('#sernp').val('');
+        $('#sernp_text').val('');
+        $('#serlv').val('');
+        $('#serlv_text').val('');
+        $("#sernp").attr("disabled", true);
+        $("#sernp_text").attr("disabled", true);
+        $("#serlv").attr("disabled", true);
+        $("#serlv_text").attr("disabled", true);
+
+        $("#sernp_text").next().find("button").attr("disabled",true);
+        $("#serlv_text").next().find("button").attr("disabled",true);
+    }
 }
 function  warehouseMustInput(flag) {
     if (flag){
@@ -358,15 +402,27 @@ function  warehouseMustInput(flag) {
 
 }
 function  financialMustInput(flag) {
-    //UICtrl.setElRequiredFlag("#mlast",flag);
-   // UICtrl.setElRequiredFlag("#vprsv",flag);
-    //UICtrl.setElRequiredFlag("#peinh",flag);
-
     UICtrl.setElRequiredFlag("#bklas",flag);
     var peinh = $("#peinh").val(); //定价基数
     if (Public.isBlank(peinh)){
         $("#peinh").val("1000");
     }
+    financialDisplayNcost($("#vprsv").val());
+}
+
+function financialDisplayNcost(vprsv) { // alert("-="+vprsv);
+    if (vprsv == 'S') { //标准价格
+        $('#ncost').val('0');
+        $('#ncost_text').val('空');
+    } else  if (vprsv == 'V') { //移动平均价格
+        if ($('#beskz').val() == 'F' || $('#sobsl').val() == '40' || $('#sobsl').val() == '70') { //外部采购，库存转储，从1010工厂领料
+            $('#ncost').val('0');
+            $('#ncost_text').val('空');
+        } else {
+            $('#ncost').val('X');
+            $('#ncost_text').val('是');
+        }
+    }
 }
 /**
  * 表单提交
@@ -377,6 +433,10 @@ function saveForm(status) {
    // let extendedData = getExtendedData();
    // debugger
    // if (!extendedData) return false;
+    if (status==1&&coRowNum<1){
+        Public.errorTip("请选择业务用途！");
+        return false;
+    }
     var _self = this;
     $("#active").val(status);
     $('#submitForm').ajaxSubmit({
@@ -727,21 +787,11 @@ function bindEvent() {
         onChange: function (value, data) {
             $('#meins').val(data.MSEH3);
             $('#meinsName').val(data.MSEHL);
-            $('#lhme1').val(data.MSEH3);  //仓库的仓库设施1存储单位
+            $('#lhme1').val(data.MSEH3);  // 仓库的仓库设施1存储单位
             $('#lhme1Name').val(data.MSEHL);
         }
     });
 
-   /* $('#raubeName').searchbox({
-        type: "system", name: "dictionary",
-        getParam: function (item) {
-            return {fieldName: "RAUBE"}
-        },
-        onChange: function (value, data) {
-            $('#raube').val(data.RAUBE);
-            $('#raubeName').val(data.NAME);
-        }
-    }); */
   //工厂
     $('#werksName').searchbox({
         type: "system", name: "dictionary",
@@ -811,7 +861,7 @@ function bindEvent() {
             $('#bstmeName').val(data.MSEHL);
         }
     });
-    bindEvent_sale();
+    bindEvent_sale(); //销售视图
     bindEvent_mrp();
     //库存地点--存储管理
     $('#lgortQmName').searchbox({
@@ -828,7 +878,6 @@ function bindEvent() {
         }
     });
     bindEvent_warehouse();
-
 }
 
 function bindEvent_sale() {
@@ -935,7 +984,7 @@ function bindEvent_mrp(){
     });
 
 
-    $('#minbeName').searchbox({
+    /*$('#minbeName').searchbox({  重订货点
         type: "system", name: "dictionary",
         getParam: function (item) {
             return {
@@ -947,7 +996,7 @@ function bindEvent_mrp(){
             $('#minbe').val(data.MINBE);
             $('#minbeName').val(data.NAME);
         }
-    });
+    }); */
 
     $('#dispoName').searchbox({
         type: "system", name: "dictionary",

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp

@@ -188,14 +188,6 @@
         <div class="hg-form-cols">
         </div>
             <div id="businessUsageDiv">
-<%--                <x:title title="分类" name="group"/>--%>
-<%--                <div class="hg-form-cols">--%>
-<%--                    <div class="hg-form-row">--%>
-<%--                        <x:inputC name="klart" label="类型" labelCol="1" fieldCol="2"/>--%>
-<%--                        <x:inputC name="classify" label="分类" labelCol="1" fieldCol="2"/>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-
                 <div class="hg-form-cols" id="saleDiv">
                     <x:title title="销售" name="group"/>
                     <div class="hg-form-row">
@@ -250,8 +242,8 @@
                     <div class="hg-form-row">
                             <x:selectC name="disgr" label="MRP组" labelCol="1" fieldCol="2" dictionary="disgr"/>
                             <x:selectC name="dismm" label="MRP类型" labelCol="1" fieldCol="2" dictionary="dismm"/>
-                            <x:hidden name="minbe"/>
-                            <x:inputC name="minbeName" label="重订货点" labelCol="1" fieldCol="2" required="false" wrapper="select"/>
+
+                            <x:inputC name="minbe" label="重订货点" labelCol="1" fieldCol="2" required="false"/>
                             <x:selectC name="dispo" label="MRP控制者" labelCol="1" fieldCol="2" required="false" dictionary="dispo"/>
                             <x:selectC name="disls" label="批量规模" labelCol="1" fieldCol="2" required="false" dictionary="disls"/>
                             <x:inputC name="bstfe" label="固定批量" labelCol="1" fieldCol="2"/>
@@ -312,8 +304,11 @@
 
                         <x:inputC name="lgortQmName" label="库存地点" labelCol="1" fieldCol="2" wrapper="select"/>
                         <x:hidden name="lgortQm"/>
-                        <x:inputC name="sernp" label="序列号参数" labelCol="1" fieldCol="2"/>
-                        <x:inputC name="serlv" label="序列号水平" labelCol="1" fieldCol="2"/>
+                        <!--x:inputC name="sernp" label="序列号参数" labelCol="1" fieldCol="2"/-->
+                        <x:selectC name="sernp" label="序列号参数" labelCol="1" fieldCol="2" dictionary="sernp"/>
+
+                        <!--x:inputC name="serlv" label="序列号水平" labelCol="1" fieldCol="2"/-->
+                        <x:selectC name="serlv" label="序列号水平" labelCol="1" fieldCol="2" dictionary="serlv"/>
                         <x:selectC name="prctr" label="利润中心" labelCol="1" fieldCol="2" dictionary="PRCTR" required="false"/>
                         <x:selectC name="insmk" label="过账到质检" labelCol="1" fieldCol="2" dictionary="insmk"/>
 
@@ -346,22 +341,6 @@
                     </div>
                 </div>
 
-<%--                <x:title title="质量管理" name="group"/>--%>
-<%--                <div class="hg-form-cols">--%>
-<%--                    <div class="hg-form-row">--%>
-<%--                        <x:inputC name="kzdkz" label="文档要求" labelCol="1" fieldCol="2"/>--%>
-<%--                        <x:inputC name="art" label="检验类型" labelCol="1" fieldCol="2"/>--%>
-<%--                        <x:inputC name="aktiv" label="激活标识" labelCol="1" fieldCol="2"/>--%>
-<%--                        <x:inputC name="insmkQm" label="过账到质检（质检）" labelCol="1" fieldCol="2"/>--%>
-<%--                        <x:inputC name="aktiv" label="激活标识" labelCol="1" fieldCol="2"/>--%>
-<%--                        <x:inputC name="ppl" label="带任务清单检验" labelCol="1" fieldCol="2"/>--%>
-<%--                        <x:inputC name="app" label="自动分配" labelCol="1" fieldCol="2"/>--%>
-<%--                        <x:inputC name="mer" label="检查特性" labelCol="1" fieldCol="2"/>--%>
-<%--                        <x:inputC name="dyn" label="允许略过" labelCol="1" fieldCol="2"/>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-
-
                 <div class="hg-form-cols" id="financialDiv">
                     <x:title title="财务核算" name="group"/>
                     <div class="hg-form-row">
@@ -369,8 +348,8 @@
                         <x:selectC name="bklas" label="评估分类" labelCol="1" fieldCol="2" dictionary="bklas"/>
                         <!--x:inputC name="mlast" label="价格确定" labelCol="1" fieldCol="2" required="false"/-->
 
-                        <x:selectC name="mlast" label="价格确定" labelCol="1" fieldCol="2" dictionary="vprsv"/>
-                        <x:selectC name="vprsv" label="价格控制" labelCol="1" fieldCol="2" dictionary="mlast"/>
+                        <x:selectC name="mlast" label="价格确定" labelCol="1" fieldCol="2" dictionary="mlast"/>
+                        <x:selectC name="vprsv" label="价格控制" labelCol="1" fieldCol="2" dictionary="vprsv"/>
                         <x:inputC name="peinh" label="定价基数" labelCol="1" fieldCol="2" required="false"/>
                         <x:inputC name="verpr" label="移动平均价" labelCol="1" fieldCol="2"/>
                         <x:inputC name="stprs" label="标准价" labelCol="1" fieldCol="2"/>

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

@@ -141,8 +141,8 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
 
         nonProdApplyBaseInfoRepository.save(baseInfo);
 
-        NonProdApplyDeptVo deptVo=null;
-        switch (businessCode) {
+        NonProdApplyDeptVo deptVo=sdo.toObject(NonProdApplyBasicVo.class);
+     /*   switch (businessCode) {
             case "K":
                 deptVo = sdo.toObject(NonProdApplyBasicVo.class);
                 break;
@@ -178,7 +178,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
                 break;
             default:
                 deptVo = sdo.toObject(NonProdApplyBasicVo.class);
-        }
+        }*/
        // SapNonProdApplyDept nonProdApplyDeptObj = sdo.toObject(SapNonProdApplyDept.class);
         //nonProdApplyDeptObj.setBaseInfoId(sdo.getId());
         deptVo.setBaseInfoId(sdo.getId());