物料主数据控制1010工厂下，不维护仓库视图；放行条增加选择采购订单；

外发单打印图片显示物料号；采购信息记录增加附件上传功能

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

@@ -145,7 +145,11 @@ function initializate() {
             $("#busiLens").val(dictUsage.length);
             coRowNum=dictUsage.length;
              for (var x=0;x<$("input[name='businessUsage']").length;x++) {
-                $("input[name='businessUsage']")[x].checked = true;
+                 if ("1010" == $("#werks").val() && x == 5){
+                     $("input[name='businessUsage']")[x].checked = false;
+                 }else {
+                     $("input[name='businessUsage']")[x].checked = true;
+                 }
              }
             showAllBusiness();
         } else {
@@ -392,6 +396,14 @@ function bindEvent() {
                 $("#lgnum").val("W00");
                 $("#lgnumName").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());
 

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

@@ -124,7 +124,11 @@ function initializate() {
             $("#busiLens").val(dictUsage.length);
             coRowNum=dictUsage.length;
              for (var x=0;x<$("input[name='businessUsage']").length;x++) {
-                $("input[name='businessUsage']")[x].checked = true;
+                 if ("1010" == $("#werks").val() && x == 5){
+                     $("input[name='businessUsage']")[x].checked = false;
+                 }else {
+                     $("input[name='businessUsage']")[x].checked = true;
+                 }
              }
             showAllBusiness();
         } else {

topsun-xt/src/main/webapp/biz/topsun/sap/permit/sapPermitDetail.js

@@ -78,7 +78,7 @@ function loadGrid() {
                             TXZ01: "belongings",
                             ZNAME: "lifnrName",
                             MEINS: "unit",
-                            MEINS: "unitName"
+                            MSEHL: "unitName"
                         }
                     }
                 }

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordDetail.js

@@ -6,6 +6,7 @@ $(document).ready(function () {
 });
 function initialize() {
     UICtrl.layout("#layout", {leftWidth: 3});
+    $('#fileList').fileList({bizId:$("#id").val()});
 }
 
 function bindEvent() {
@@ -529,6 +530,7 @@ function setId(value) {
     $("#id").val(value);
     var _grid=UICtrl.getGridManager('#maingrid');
     _grid.options.parms.sapPurchaseInfoRecordId = value;
+    $('#fileList').fileList({bizId : value});
 }
 
 function reloadGrid() {

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordDetail.jsp

@@ -32,6 +32,9 @@
             </div>
         </div>
         <div id="maingrid"></div>
+        <div style="padding-top: 15px;">
+            <x:fileList bizCode="purchaseInfoRecord" bizId="id" id="fileList" title="相关资料" />
+        </div>
     </form>
 </div>
 </body>
\ No newline at end of file

topsun-xt/src/main/webapp/template/print/topsun/processOuter.ftl

@@ -178,16 +178,19 @@
 <#if productInfoVoList?? && productInfoVoList?size gt 0>
     <table cellspacing="0px" cellpadding="0px" class="tableBorder">
         <colgroup>
-            <col width='50%' />
-            <col width='50%' />
+            <col width='8%' />
+            <col width='46%' />
+            <col width='46%' />
 
         </colgroup>
         <tr>
+            <td class="left">产品编码</td>
             <td class="left">产品正面图片：</td>
             <td class="left">产品背面图片：</td>
         </tr>
         <#list productInfoVoList as detail>
             <tr>
+                <td class="center">${detail.matnr?default("")?html}</td>
                 <td class="center">
                     <img src='${detail.frontImg?default("")?html}' width="230px"/>
                 </td>

topsun-xt/src/main/webapp/template/print/topsun/processOuter2.ftl

@@ -175,16 +175,19 @@
 <#if productInfoVoList?? && productInfoVoList?size gt 0>
     <table cellspacing="0px" cellpadding="0px" class="tableBorder">
         <colgroup>
-            <col width='50%' />
-            <col width='50%' />
+            <col width='8%' />
+            <col width='46%' />
+            <col width='46%' />
 
         </colgroup>
         <tr>
+            <td class="left">产品编码</td>
             <td class="left">产品正面图片：</td>
             <td class="left">产品背面图片：</td>
         </tr>
         <#list productInfoVoList as detail>
             <tr>
+                <td class="center">${detail.matnr?default("")?html}</td>
                 <td class="center">
                     <img src='${detail.frontImg?default("")?html}' width="230px"/>
                 </td>

topsun/src/main/java/com/huigou/topsun/ep/epApplication/EpVo/EpProductInfoVo.java

@@ -12,6 +12,10 @@ import java.math.BigDecimal;
  */
 @Data
 public class EpProductInfoVo implements Serializable {
+    /**
+     * 产品编号
+     */
+    private String matnr;
     /**
      * 印张规格
      */

topsun/src/main/java/com/huigou/topsun/ep/epApplication/impl/EpApplicationImpl.java

@@ -109,6 +109,7 @@ public class EpApplicationImpl implements EpApplication {
         } catch (IOException e) {
             throw new RuntimeException("查询生产版本正反面图片出错：" + message);
         }
+        epProductInfoVo.setMatnr(matnr2.replaceFirst("^0*", ""));
         return epProductInfoVo;
     }
 

topsun/src/main/java/com/huigou/topsun/sap/sapApplication/application/impl/SapDictionaryApplicationImpl.java

@@ -127,12 +127,18 @@ public class SapDictionaryApplicationImpl implements SapDictionaryApplication {
             if (length >= 1){
                 widths[u]="100";
             }
-            if (length >= 20 ) {
-                widths[u]="200";
-            }
-            if (length >= 30 ) {
-                widths[u]="250";
+            if (length >= 10){
+                widths[u]=String.valueOf(length*10);
             }
+//            if (length >= 15){
+//                widths[u]="150";
+//            }
+//            if (length >= 20 ) {
+//                widths[u]="200";
+//            }
+//            if (length >= 30 ) {
+//                widths[u]="250";
+//            }
             u++;
         }
         return widths;