数据接口调整

js/service/material.js

@@ -306,7 +306,7 @@ var ServiceMaterial={
         //     stockSum:"20"
         // });
 
-        var materialList=MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getListByOrderSheet?type=1");
+        var materialList=MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getListByOrderSheet?type=3");
 
         materialList.forEach(element => {
             element.orderSheetCode=element.mocode
@@ -315,6 +315,7 @@ var ServiceMaterial={
             element.specs=""//element.cinvstd
             element.needSum=element.qtys
             element.stockSum=element.issQty
+            element.shortageQuantity=element.shortageQuantity
         });
         
         return materialList;

js/service/product.js

@@ -66,7 +66,8 @@ var ServiceProduct = {
     },
     // 月成品出货统计，根据成品维度
     getMonthSend: function () {
-        return getService.methodGet("/fbsRdrecord32/fbsRdrecords32/getMonthSend");
+        // return getService.methodGet("/fbsRdrecord32/fbsRdrecords32/getMonthSend");
+        return getService.methodGet("/fbsDispatchLists/fbsDispatchLists/getProjectDelivery");
 
         // return {
         //     "成品A": 20,

pages/dashboard/quality.html

@@ -116,9 +116,9 @@
                     <div class="col-lg-1 col-md-1 center no-padding padding-line">序号</div>
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">计划到货日期</div>
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">供应商</div>
-                    <div class="col-lg-1 col-md-1 center no-padding padding-line">物料号</div>
+                    <div class="col-lg-2 col-md-2 center no-padding padding-line">物料号</div>
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">名称</div>
-                    <div class="col-lg-2 col-md-2 center no-padding padding-line">型号规格</div>
+                    <!-- <div class="col-lg-2 col-md-2 center no-padding padding-line">型号规格</div> -->
                     <div class="col-lg-1 col-md-1 center no-padding">到货<br />数量</div>
                     <div class="col-lg-1 col-md-1 center no-padding padding-line">备注</div>
                 </div>
@@ -128,34 +128,34 @@
                             <div class="col-lg-1 col-md-1 center no-padding">{{product.index}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{product.arriveDate}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{product.cVenCode}}</div>
-                            <div class="col-lg-1 col-md-1 center no-padding">{{product.materialCode}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{product.materialCode}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{product.materialName}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div>
+                            <!-- <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div> -->
                             <div class="col-lg-1 col-md-1 center no-padding">{{product.arriveSum}}</div>
                             <div class="col-lg-1 col-md-1 center no-padding">{{product.memo}}</div>
                         </div>
                     </div>
                 </div>
-                <div class="row block-padding">
+                <!-- <div class="row block-padding">
                     <div class="col-lg-12 col-md-12 center block-title">当月供应商合格率实时展示</div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-12" style="height:300px" id="charts_31"></div>
-                </div>
+                </div> -->
             </div>
         </div>
         <div class="row block-padding">
             <div class="col-md-1 col-lg-1 center block-title" style="padding-top: 80px">
                 质<br />量<br />异<br />常<br />信<br />息
             </div>
-            <d class="col-md-7 col-lg-7">
+            <d class="col-md-6 col-lg-6">
                 <div class="row">
                     <div class="col-lg-1 col-md-1 center no-padding padding-line">序号</div>
                     <div class="col-lg-1 col-md-2 center no-padding padding-line">检验日期</div>
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">供应商</div>
                     <div class="col-lg-1 col-md-1 center no-padding padding-line">物料号</div>
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">名称</div>
-                    <div class="col-lg-2 col-md-2 center no-padding padding-line">型号规格</div>
+                    <!-- <div class="col-lg-2 col-md-2 center no-padding padding-line">型号规格</div> -->
                     <div class="col-lg-3 col-md-3 center no-padding">
                         <div class="row">
                             <div class="col-lg-3 col-md-3 center no-padding">到货<br />数量</div>
@@ -172,7 +172,7 @@
                     <div class="col-lg-2 col-md-2 center no-padding">{{material.vendorName}}</div>
                     <div class="col-lg-1 col-md-1 center no-padding">{{material.materialCode}}</div>
                     <div class="col-lg-2 col-md-2 center no-padding">{{material.materialName}}</div>
-                    <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div>
+                    <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div> -->
                     <div class="col-lg-3 col-md-3 center no-padding">
                         <div class="row">
                             <div class="col-lg-3 col-md-3 center no-padding">{{material.arriveSum}}</div>
@@ -255,8 +255,8 @@
                     // 刷新报表
                     ChartsService.initBarAndLine("charts_11", ServiceMaterial
                         .getLastSixMonthQualityTargetCompare(), ChartsService.getGridSpanSmall());
-                    ChartsService.initBarWithShade("charts_31", ServiceMaterial.getPassRateByVendor(),
-                        ChartsService.getGridSpanSmall());
+                    // ChartsService.initBarWithShade("charts_31", ServiceMaterial.getPassRateByVendor(),
+                    //     ChartsService.getGridSpanSmall());
                     ChartsService.initBarWithShade("charts_21", ServiceMaterial.getCheckRateByBatchno(),
                         ChartsService.getGridSpanSmall());
                     this.loadData();
@@ -326,7 +326,7 @@
                     const unpassList = ServiceMaterial.getQualityUnpassList();
                     this.cacheDataObject.unpassList = {
                         data: unpassList,
-                        pagesize: 15,
+                        pagesize: 10,
                         pageindex: 0
                     }
                     this.unpassList = unpassList.slice(0, this.cacheDataObject

pages/dashboard/warehouse.html

@@ -76,20 +76,24 @@
                 <div class="row">
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">供方名称</div>
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">物料号</div>
-                    <div class="col-lg-3 col-md-3 center no-padding padding-line">名称</div>
-                    <div class="col-lg-2 col-md-2 center no-padding padding-line">规格</div>
+                    <div class="col-lg-2 col-md-2 center no-padding padding-line">名称</div>
+                    <!-- <div class="col-lg-2 col-md-2 center no-padding padding-line">规格</div> -->
                     <div class="col-lg-1 col-md-1 center no-padding">到货数量</div>
+                    <div class="col-lg-1 col-md-1 center no-padding">入库数量</div>
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">到货日期</div>
+                    <div class="col-lg-2 col-md-2 center no-padding padding-line">订单日期</div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-12" style="height: 160px;">
                         <div class="row" v-for="material in waitingcheckMaterialList">
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.vendorName}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
-                            <div class="col-lg-3 col-md-3 center no-padding">{{material.materialName}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{material.materialName}}</div>
+                            <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div> -->
                             <div class="col-lg-1 col-md-1 center no-padding">{{material.arriveSum}}</div>
+                            <div class="col-lg-1 col-md-1 center no-padding">{{material.freceivedqty}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.arriveDate}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{material.dPODate}}</div>
                         </div>
                     </div>
                 </div>
@@ -106,9 +110,35 @@
                         </div>
                     </div>
                 </div>
-                <!--待入库-->
+                
+                <!--安全库存-->  
                 <div class="row block-padding">
 
+                    <div class="col-lg-12 col-md-12 center block-title">安全库存</div>
+                </div>
+                <div class="row">
+                    <div class="col-lg-2 col-md-2 center no-padding">物料号</div>
+                    <div class="col-lg-4 col-md-4 center no-padding">名称</div>
+                    <div class="col-lg-2 col-md-2 center no-padding">现存量</div>
+                    <div class="col-lg-2 col-md-2 center no-padding">安全库存</div>
+                    <div class="col-lg-2 col-md-2 center no-padding">总数量</div>
+                </div>
+                <div class="row">
+                    <div class="col-lg-12 col-md-12" style="height: 300px;">
+                        <div class="row" v-for="material in materialStockList">
+                            <div class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
+                            <div class="col-lg-4 col-md-4 center no-padding">{{material.materialName}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding"
+                                :class="getMaterialStockNotEnoughClass(material)">
+                                {{material.realStockSum}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{material.safeStockSum}}</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">{{material.realStockSum+material.safeStockSum}}</div>
+                        </div>
+                    </div>
+                </div>
+                <!--待入库-->
+                <!-- <div class="row block-padding">
+
                     <div class="col-lg-12 ">
                         <span class="block-title">待入库</span>
                         &nbsp;&nbsp;
@@ -119,7 +149,6 @@
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">供方名称</div>
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">物料号</div>
                     <div class="col-lg-3 col-md-3 center no-padding padding-line">名称</div>
-                    <div class="col-lg-2 col-md-2 center no-padding padding-line">规格</div>
                     <div class="col-lg-1 col-md-1 center no-padding">到货数量</div>
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">到货日期</div>
                 </div>
@@ -129,7 +158,6 @@
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.vendorName}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
                             <div class="col-lg-3 col-md-3 center no-padding">{{material.materialName}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div>
                             <div class="col-lg-1 col-md-1 center no-padding">{{material.arriveSum}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.arriveDate}}</div>
                         </div>
@@ -146,7 +174,7 @@
                             未完成：{{waitinginMaterialSum}}
                         </div>
                     </div>
-                </div>
+                </div> -->
                 <!--发货通知-->
                 <div class="row block-padding">
 
@@ -157,20 +185,23 @@
                     </div>
                 </div>
                 <div class="row">
+                    
+                    <div class="col-lg-2 col-md-2 center no-padding padding-line">项目名称</div>
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">仓库</div>
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">物料号</div>
                     <div class="col-lg-3 col-md-3 center no-padding padding-line">名称</div>
-                    <div class="col-lg-2 col-md-2 center no-padding padding-line">规格</div>
+                    <!-- <div class="col-lg-2 col-md-2 center no-padding padding-line">规格</div> -->
                     <div class="col-lg-1 col-md-1 center no-padding">发货数量</div>
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">发货日期</div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-12" style="height: 140px;">
                         <div class="row" v-for="product in waitingSendProductList">
+                            <div class="col-lg-2 col-md-2 center no-padding">{{product.cItemName}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{product.warehouseName}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{product.materialCode}}</div>
                             <div class="col-lg-3 col-md-3 center no-padding">{{product.materialName}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div>
+                            <!-- <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div> -->
                             <div class="col-lg-1 col-md-1 center no-padding">{{product.sendSum}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{product.planSendDate}}</div>
                         </div>
@@ -191,51 +222,56 @@
             </div>
             <div class="col-lg-6">
                 <div class="row block-padding">
-                    <div class="col-lg-6">
+                    <div class="row">
                         <div class="row">
-                            <div class="col-lg-12 col-md-12 center block-title">月成品出货统计</div>
+                            <!-- <div class="col-lg-12 col-md-12 center block-title">月成品出货统计</div> -->
+                            <div class="col-lg-12 col-md-12 center block-title">项目月发货统计</div>
                         </div>
                         <div class="row">
                             <div class="col-lg-12 col-md-12" style="height:440px" id="charts_11"></div>
                         </div>
                     </div>
-                    <div class="col-lg-6">
+                    <!-- <div class="col-lg-6">
                         <div class="row">
                             <div class="col-lg-12 col-md-12 center block-title">项目月发货统计</div>
                         </div>
                         <div class="row">
                             <div class="col-lg-12 col-md-12" style="height:440px" id="charts_12"></div>
                         </div>
-                    </div>
+                    </div> -->
 
                 </div>
+                
                 <div class="row block-padding">
-                    <div class="col-lg-6 col-md-6" style="padding-left:30px;">
-                        <!--安全库存-->
+                    
+                    <!-- <div class="col-lg-6 col-md-6" style="padding-left:30px;">
+                        
                         <div class="row ">
 
                             <div class="col-lg-12 col-md-12 center block-title">安全库存</div>
                         </div>
                         <div class="row block-padding">
                             <div class="col-lg-2 col-md-2 center no-padding">物料号</div>
-                            <div class="col-lg-6 col-md-6 center no-padding">名称</div>
+                            <div class="col-lg-4 col-md-4 center no-padding">名称</div>
                             <div class="col-lg-2 col-md-2 center no-padding">现存量</div>
                             <div class="col-lg-2 col-md-2 center no-padding">安全库存</div>
+                            <div class="col-lg-2 col-md-2 center no-padding">总数量</div>
                         </div>
                         <div class="row">
                             <div class="col-lg-12 col-md-12" style="height: 300px;">
                                 <div class="row" v-for="material in materialStockList">
                                     <div class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
-                                    <div class="col-lg-6 col-md-6 center no-padding">{{material.materialName}}</div>
+                                    <div class="col-lg-4 col-md-4 center no-padding">{{material.materialName}}</div>
                                     <div class="col-lg-2 col-md-2 center no-padding"
                                         :class="getMaterialStockNotEnoughClass(material)">
                                         {{material.realStockSum}}</div>
                                     <div class="col-lg-2 col-md-2 center no-padding">{{material.safeStockSum}}</div>
+                                    <div class="col-lg-2 col-md-2 center no-padding">{{material.realStockSum+material.safeStockSum}}</div>
                                 </div>
                             </div>
                         </div>
-                    </div>
-                    <div class="col-lg-6">
+                    </div> -->
+                    <div class="row">
                         <div class="row">
                             <div class="col-lg-12 col-md-12 center block-title">成品库存</div>
                         </div>
@@ -262,9 +298,10 @@
                     <div class="col-lg-2 col-md-2 center no-padding">工单号</div>
                     <div class="col-lg-2 col-md-2 center no-padding">物料号</div>
                     <div class="col-lg-2 col-md-2 center no-padding">名称</div>
-                    <div class="col-lg-2 col-md-2 center no-padding">规格</div>
+                    <!-- <div class="col-lg-2 col-md-2 center no-padding">规格</div> -->
                     <div class="col-lg-2 col-md-2 center no-padding">总料数</div>
                     <div class="col-lg-2 col-md-2 center no-padding">已备数</div>
+                    <div class="col-lg-1 col-md-1 center no-padding">缺料</div>
                 </div>
                 <div class="row">
                     <div class="col-lg-12 col-md-12" style="height: 180px;">
@@ -272,11 +309,15 @@
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.orderSheetCode}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.materialName}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding"
-                                :class="getOrderSheetStockNotEnoughClass(material)">
+                            <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div> -->
+                            <!-- <div class="col-lg-2 col-md-2 center no-padding"
+                                :class="getOrderSheetStockNotEnoughClass(material)"
+                                > -->
+                                <div class="col-lg-2 col-md-2 center no-padding"
+                                >
                                 {{material.needSum}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.stockSum}}</div>
+                            <div class="col-lg-1 col-md-1 center no-padding error-font" :class="getshortageQuantity(material)">{{material.shortageQuantity}}</div>
                         </div>
                     </div>
                 </div>
@@ -324,7 +365,7 @@
                     <div class="col-lg-2 col-md-2 center no-padding">工单号</div>
                     <div class="col-lg-2 col-md-2 center no-padding">物料号</div>
                     <div class="col-lg-2 col-md-2 center no-padding">名称</div>
-                    <div class="col-lg-2 col-md-2 center no-padding">规格</div>
+                    <!-- <div class="col-lg-2 col-md-2 center no-padding">规格</div> -->
                     <div class="col-lg-2 col-md-2 center no-padding">总料数</div>
                     <div class="col-lg-2 col-md-2 center no-padding">已备数</div>
                 </div>
@@ -334,7 +375,7 @@
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.orderSheetCode}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.materialName}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div>
+                            <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div> -->
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.needSum}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.stockSum}}</div>
                         </div>
@@ -353,7 +394,7 @@
                     <div class="col-lg-2 col-md-2 center no-padding">工单号</div>
                     <div class="col-lg-2 col-md-2 center no-padding">物料号</div>
                     <div class="col-lg-2 col-md-2 center no-padding">名称</div>
-                    <div class="col-lg-2 col-md-2 center no-padding">规格</div>
+                    <!-- <div class="col-lg-2 col-md-2 center no-padding">规格</div> -->
                     <div class="col-lg-2 col-md-2 center no-padding">申请人</div>
                     <div class="col-lg-2 col-md-2 center no-padding">数量</div>
                 </div>
@@ -363,7 +404,7 @@
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.orderSheetCode}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.materialName}}</div>
-                            <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div>
+                            <!-- <div class="col-lg-2 col-md-2 center no-padding">{{material.specs}}</div> -->
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.applyPerson}}</div>
                             <div class="col-lg-2 col-md-2 center no-padding">{{material.applysum}}</div>
                         </div>
@@ -448,13 +489,20 @@
                     }
                     return "";
                 },
+                //缺料
+                getshortageQuantity:function(material){
+                    if(material.shortageQuantity*1>0){
+                        return "error-font";
+                    }
+                    return "";
+                },
                 // 从服务器加载数据并显示
                 refreshData: function () {
                     // 关闭定时器
                     clearInterval(this.timer_short);
                     // 刷新报表
                     ChartsService.initCommonBar("charts_11", ServiceProduct.getMonthSend());
-                    ChartsService.initLineWithShade("charts_12", ServiceProduct.getMonthSendByProject());
+                    // ChartsService.initLineWithShade("charts_12", ServiceProduct.getMonthSendByProject());
                     ChartsService.initCommonBar("charts_22", ServiceProduct.getStockList());
                     this.loadData();
                     // 开启定时器
@@ -519,16 +567,18 @@
                     // 收料待检
                     const waitingcheckMaterialList = ServiceMaterial.getWatingCheckList();
                     $.each(waitingcheckMaterialList,function(index,item){
-                        if (item.specs.length>6)
-                            item.specs = item.specs.substr(0,6);
-                        item.arriveDate = item.arriveDate.replace(/-/g,"");
+                        // if (item.specs.length>6)
+                        //     item.specs = item.specs.substr(0,6);
+                        // item.arriveDate = item.arriveDate.replace(/-/g,"");
                     });
                     this.waitingcheckMaterialSum = waitingcheckMaterialList.length;
                     this.checkedMaterialSum = ServiceMaterial.getCheckSum();
+                    
                     const checkedMaterialSumPercent = (this.checkedMaterialSum / (this.checkedMaterialSum +
                             this.waitingcheckMaterialSum) * 100)
-                        .toFixed(0);
+                        .toFixed(2);
                     this.waitingcheckMaterialSumPercent = (100 - checkedMaterialSumPercent) + '%';
+                    
                     this.checkedMaterialSumPercent = checkedMaterialSumPercent + '%';
                     this.cacheDataObject.waitingcheckMaterialList = {
                         data: waitingcheckMaterialList,
@@ -563,7 +613,7 @@
                     const materialStockList = ServiceMaterial.getStockList();
                     this.cacheDataObject.materialStockList = {
                         data: materialStockList,
-                        pagesize: 22,
+                        pagesize: 10,
                         pageindex: 0
                     }
                     this.materialStockList = materialStockList.slice(0, this.cacheDataObject
@@ -573,6 +623,7 @@
                     var orderSheetMaterialNeedSum = 0;
                     var orderSheetMaterialStockSum = 0;
 
+                    this.orderSheetMaterialNeedSum = orderSheetMaterialList.length;
                     orderSheetMaterialNeedSum = orderSheetMaterialList.length;
                     $.each(orderSheetMaterialList, function (index, item) {
                         if (item.needSum * 1 > item.stockSum * 1)