刀模板具不维护存储条件和仓库视图

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

@@ -58,6 +58,20 @@ function initializate() {
                 $("#lgort").val("1099");
                 $("#lgortName").val("客供料专用库");
             }
+            //刀工模板具
+            if ((data.value == "ZGMB")){
+                $("#raube").val("");
+                Public.tip("刀工模板具不维护仓库管理视图");
+                $("#businessUsageS").prop("checked",false);
+            }else {
+                if ($("#werks").val() == "1010"){
+                    Public.tip("广州市宝绅科技有限公司RFID工厂不维护仓库管理视图");
+                    $("#businessUsageS").prop("checked",false);
+                }else {
+                    $("#businessUsageS").prop("checked",true);
+                }
+                bindEvent_raube($('#werks').val(),$("#lgort").val());
+            }
             bindEvent_mrp(data.value)
             bindEvent_produce(data.value);
             bindEvent_warehouse(data.value);
@@ -92,6 +106,9 @@ function initializate() {
     //存储分区标识
     $("#lgbkz").val("001");
 
+    //倒冲标志 :默认0
+    $("#rgekz").val("0");
+
     switch ($("#active").val()) {
         case '0'://待填报
           //  $("#businessUsageDiv").hide();
@@ -145,7 +162,7 @@ function initializate() {
             $("#busiLens").val(dictUsage.length);
             coRowNum=dictUsage.length;
              for (var x=0;x<$("input[name='businessUsage']").length;x++) {
-                 if ("1010" == $("#werks").val() && x == 5){
+                 if (("1010" == $("#werks").val() || "ZGMB" == $("#mtart").val()) && x == 5){
                      $("input[name='businessUsage']")[x].checked = false;
                  }else {
                      $("input[name='businessUsage']")[x].checked = true;
@@ -169,6 +186,15 @@ function initializate() {
             coRowNum=MathUtil.add(coRowNum,1);
             showBusiness($(this).val());
 
+            if ("S"== $(this).val() ){
+                $("#businessUsageS").prop("checked",false);
+                if ($("#werks").val() == "1010"){
+                    Public.tip("广州市宝绅科技有限公司RFID工厂不维护仓库管理视图");
+                }
+                if ($("#mtart").val() == "ZGMB"){
+                    Public.tip("刀工模板具不维护仓库管理视图");
+                }
+            }
             if (coRowNum==dictUsage.length){
                 $('input[name="isAll"]')[0].checked = true;
             }
@@ -397,15 +423,21 @@ function bindEvent() {
                 $("#lgnumName").val("广州宝绅印刷工厂仓库");
             }
 
+
+            var mtart = $("#mtart").val();
+            if (mtart != "ZGMB" ){
+                //选择了工厂和库存地点后，带出存储条件
+                bindEvent_raube(data.WERKS,$('#lgort').val());
                 if (data.WERKS == "1010" && $("input[name='businessUsage']")[5].checked){
                     Public.tip("广州市宝绅科技有限公司RFID工厂不维护仓库管理视图");
                     $("#businessUsageS").prop("checked",false);
-                //return false;
                 }else {
                     $("#businessUsageS").prop("checked",true);
                 }
-            //选择了工厂和库存地点后，带出存储条件
-            bindEvent_raube(data.WERKS,$('#lgort').val());
+            }else {
+                Public.tip("刀工模板具不维护仓库管理视图");
+                $("#businessUsageS").prop("checked",false);
+            }
 
             //选择了工厂、库存地点、仓库号，带出存储类型和上下架存储类型
             bindEvent_lgtyp(data.WERKS,$('#lgort').val(),$('#lgnum').val());
@@ -438,8 +470,12 @@ function bindEvent() {
                 $("#lgnum").val("W00");
                 $("#lgnumName").val("广州宝绅印刷工厂仓库");
             }
+
+            var mtart = $("#mtart").val();
+            if (mtart != "ZGMB" ){
                 //选择了工厂和库存地点后，带出存储条件
                 bindEvent_raube($('#werks').val(),data.LGORT);
+            }
 
             //选择了工厂、库存地点、仓库号，带出存储类型和上下架存储类型
             bindEvent_lgtyp($('#werks').val(),data.LGORT,$('#lgnum').val());

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

@@ -135,7 +135,7 @@ function loadNonProdApplyListGrid() {
             {display: "尺码", name: "size", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "品牌", name: "brand", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "用途", name: "materialUsage", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "物品属性", name: "itemAttributesTextView", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "物品类型", name: "mtartTextView", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "业务用途", name: "businessUsageTextView", width: 300, minWidth: 60, type: "string", align: "left"},
             {display: "文本说明", name: "textDescription", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "批准人", name: "approver", width: 100, minWidth: 60, type: "string", align: "left"},

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

@@ -15,7 +15,7 @@ $(document).ready(function () {
 
 
 function initializate() {
-   // UICtrl.setDisable("#businessUsageDiv")
+    UICtrl.disable("#mtart")
     UICtrl.setDisable("#totalContentDiv");
     coRowNum= $("#busiLens").val();
     initKlart($("#mtart").val());
@@ -77,8 +77,12 @@ function initializate() {
           //  $("#businessUsageDiv").hide();
             hideAllBusiness(false); //隐藏但不清理值
             for (var x=0;x<$("input[name='businessUsage']").length;x++) {
+                var value = $("input[name='businessUsage']")[x].value;
+                if ("S" == value){
+                    $("#businessUsageS").prop("checked",false);
+                }
                if ($("input[name='businessUsage']")[x].checked) {
-                  showBusiness($("input[name='businessUsage']")[x].value);
+                  showBusiness(value);
                }
             }
             if ($("#deptCode").val() === "system") {
@@ -124,7 +128,7 @@ function initializate() {
             $("#busiLens").val(dictUsage.length);
             coRowNum=dictUsage.length;
              for (var x=0;x<$("input[name='businessUsage']").length;x++) {
-                 if ("1010" == $("#werks").val() && x == 5){
+                 if (("1010" == $("#werks").val() || "ZGMB" == $("#mtart").val()) && x == 5){
                      $("input[name='businessUsage']")[x].checked = false;
                  }else {
                      $("input[name='businessUsage']")[x].checked = true;
@@ -148,6 +152,15 @@ function initializate() {
             coRowNum=MathUtil.add(coRowNum,1);
             showBusiness($(this).val());
 
+            if ("S"== $(this).val() ){
+                $("#businessUsageS").prop("checked",false);
+                if ($("#werks").val() == "1010"){
+                    Public.tip("广州市宝绅科技有限公司RFID工厂不维护仓库管理视图");
+                }
+                if ($("#mtart").val() == "ZGMB"){
+                    Public.tip("刀工模板具不维护仓库管理视图");
+                }
+            }
             if (coRowNum==dictUsage.length){
               $('input[name="isAll"]')[0].checked = true;
             }
@@ -182,6 +195,10 @@ function initRaube(mtart) {
         $("#raube").val("S1");
         $("#raube_text").val("S1-小塘工厂五金库拣配_3000");
     }
+    if (mtart == "ZGMB"){
+        UICtrl.setElRequiredFlag("#raube",false);
+        UICtrl.setElRequiredFlag("#lgtypName",false);
+    }
 }
 
 function initSale(mtart){

topsun-xt/src/main/webapp/biz/topsun/sap/produceSupplierReview/produceSupplierReviewDetail.jsp

@@ -116,7 +116,7 @@
                             <x:radioC name="isOnsiteAudit" title="是否安排实地考察" dictionary="yesorno" required="false" label="是否安排实地考察" labelCol="2" fieldCol="2"/>
                             <x:radioC name="isApprovedSupplier" title="是否录入合格供方" dictionary="yesorno" required="false" label="是否录入合格供方" labelCol="2" fieldCol="2"/>
                         </div>
-                        <div style="padding-top: 15px;">
+                        <div class="hg-form-row">
                             <x:fileList bizCode="produceSupplierInfo" bizId="attbizId" id="produceSupplierInfoList" title="相关资料" />
                         </div>
                     </div>

topsun/src/main/java/com/huigou/topsun/sap/common/DefaultHttpClient.java

@@ -199,7 +199,7 @@ public class DefaultHttpClient extends BaseApplication implements HttpClient {
             response = http.execute(get);
             StatusLine statusLine = response.getStatusLine();
             int statusCode = statusLine.getStatusCode();
-            if (statusLine.getStatusCode() < HttpStatus.SC_OK || statusLine.getStatusCode() >= HttpStatus.SC_MULTIPLE_CHOICES) {
+            if (statusLine.getStatusCode() != HttpStatus.SC_OK) {
                 throw new IOException(String.format("调用系统出错，statusCode=%s, %s", statusCode, statusLine.getReasonPhrase()));
             }
             responseText = EntityUtils.toString(response.getEntity(), "UTF-8");

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

@@ -369,7 +369,7 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
         QueryModel model = this.sqlExecutorDao.getQueryModel(queryDescriptor, query);
         model.putDictionary("maintenanceType", DictUtil.getDictionary("maintainType"));
         model.putDictionary("baseUnit", DictUtil.getDictionary("measuringUnit"));
-        model.putDictionary("itemAttributes", DictUtil.getDictionary("suppliesType"));
+        model.putDictionary("mtart", DictUtil.getDictionary("suppliesType"));
         model.putDictionary("businessUsage", DictUtil.getDictionary("serviceusage"));
         model.putDictionary("status", DictUtil.getDictionary("bizBillStatus"));
         model.setSortFieldName("billCode");

topsun/src/main/java/com/huigou/topsun/sap/productScrapApply/application/impl/ProductScrapApplyApplicationImpl.java

@@ -236,16 +236,16 @@ public class ProductScrapApplyApplicationImpl extends FlowBroker implements Prod
     public String saveProductScrapApplyVo(List<ProductScrapApplyVo> productScrapApplyVoListVo) {
         String productScrapApplyId = "";
         ProductScrapApply productScrapApply = new ProductScrapApply();
+        String zuser1 = productScrapApplyVoListVo.get(0).getZuser1();
         //根据SAP传过来的创建人编码，映射流程发起人
+        Org org = orgApplication.loadMainOrgByLoginName(zuser1);
+        if (ObjectUtil.isNull(org)){
             String acceptPersonCode = SystemCache.getParameter("acceptPersonCode", String.class);
-        Org org = orgApplication.loadMainOrgByLoginName(acceptPersonCode);
-        if (ObjectUtil.isNotNull(org)){
+            org = orgApplication.loadMainOrgByLoginName(acceptPersonCode);
+        }
         Operator operator = operatorApplication.createOperatorByPersonMemberId(org.getId());
         ThreadLocalUtil.putOperator(operator);
-        }else {
-            //throw new RuntimeException("未找到采购申请创建人：" + ernam);
-        }
-        //发起流程  05.11  lxh
+        //发起流程
         List<ProductScrapApplyItem> productScrapApplyItems =  new ArrayList<>();
         for (ProductScrapApplyVo productScrapApplyVo : productScrapApplyVoListVo) {
             ProductScrapApplyItem productScrapApplyItem = new ProductScrapApplyItem();

topsun/src/main/java/com/huigou/topsun/sap/productScrapApply/controller/ProductScrapApplyController.java

@@ -61,16 +61,16 @@ public class ProductScrapApplyController extends CommonController {
             if (CollectionUtils.isEmpty(productScrapApplyVoListVo)){
                 messageMap.put("CODE","E");
                 messageMap.put("MSG","未接收到数据，请检查");
-                messageMap.put("DATA",billCode);
+                messageMap.put("DATA","");
             }else {
                 billCode = this.productScrapApplyApplication.saveProductScrapApplyVo(productScrapApplyVoListVo);
             }
-            messageMap.put("ZBPMID",billCode);
         }catch (RuntimeException e){
             messageMap.put("CODE","E");
             messageMap.put("MSG",e.getMessage());
-            messageMap.put("DATA",billCode);
+            messageMap.put("DATA","");
         }
+        messageMap.put("ZBPMID",billCode);
         return messageMap;
     }
 

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

@@ -2,7 +2,7 @@
 <query-mappings>
     <query name="slicedNonProdApplyBaseInfoQuery" table="sap_non_prod_apply_base_info">
         <sql-query>
-            select t.*,ad.matnr,ad.status as dept_status,ad.maktx,ad.werks,ad.werks_name from sap_non_prod_apply_base_info t left join sap_non_prod_apply_dept ad on t.id  = ad.base_info_id where 1=1
+            select t.*,ad.matnr,ad.status as dept_status,ad.maktx,ad.werks,ad.werks_name,ad.mtart  from sap_non_prod_apply_base_info t left join sap_non_prod_apply_dept ad on t.id  = ad.base_info_id where 1=1
         </sql-query>
         <condition column="matnr" name="matnr" type="java.lang.String" symbol="like" alias="ad"/>
         <condition column="status" name="status" type="java.lang.String" symbol="in" alias="t"/>