11

js/service/material.js

@@ -248,109 +248,132 @@ var ServiceMaterial={
     },
     // 工单备料
     getListByOrderSheet:function(){
-        const materialList = [];
-        materialList.push({
-            orderSheetCode:"G10001",
-            materialCode:"10001",
-            materialName:"物料A",
-            specs:"3*4",
-            needSum:"20",
-            stockSum:"20"
-        });
-        materialList.push({
-            orderSheetCode:"G10001",
-            materialCode:"10002",
-            materialName:"物料B",
-            specs:"3*4",
-            needSum:"10",
-            stockSum:"30"
-        });
-        materialList.push({
-            orderSheetCode:"G10002",
-            materialCode:"10003",
-            materialName:"物料C",
-            specs:"3*4",
-            needSum:"40",
-            stockSum:"20"
-        });
-        materialList.push({
-            orderSheetCode:"G10003",
-            materialCode:"10004",
-            materialName:"物料D",
-            specs:"3*4",
-            needSum:"30",
-            stockSum:"30"
-        });
-        materialList.push({
-            orderSheetCode:"G10004",
-            materialCode:"10005",
-            materialName:"物料E",
-            specs:"3*4",
-            needSum:"20",
-            stockSum:"20"
-        });
-        materialList.push({
-            orderSheetCode:"G10001",
-            materialCode:"10001",
-            materialName:"物料A",
-            specs:"3*4",
-            needSum:"20",
-            stockSum:"20"
-        });
-        materialList.push({
-            orderSheetCode:"G10004",
-            materialCode:"10005",
-            materialName:"物料E",
-            specs:"3*4",
-            needSum:"20",
-            stockSum:"20"
+        // const materialList = [];
+        // materialList.push({
+        //     orderSheetCode:"G10001",
+        //     materialCode:"10001",
+        //     materialName:"物料A",
+        //     specs:"3*4",
+        //     needSum:"20",
+        //     stockSum:"20"
+        // });
+        // materialList.push({
+        //     orderSheetCode:"G10001",
+        //     materialCode:"10002",
+        //     materialName:"物料B",
+        //     specs:"3*4",
+        //     needSum:"10",
+        //     stockSum:"30"
+        // });
+        // materialList.push({
+        //     orderSheetCode:"G10002",
+        //     materialCode:"10003",
+        //     materialName:"物料C",
+        //     specs:"3*4",
+        //     needSum:"40",
+        //     stockSum:"20"
+        // });
+        // materialList.push({
+        //     orderSheetCode:"G10003",
+        //     materialCode:"10004",
+        //     materialName:"物料D",
+        //     specs:"3*4",
+        //     needSum:"30",
+        //     stockSum:"30"
+        // });
+        // materialList.push({
+        //     orderSheetCode:"G10004",
+        //     materialCode:"10005",
+        //     materialName:"物料E",
+        //     specs:"3*4",
+        //     needSum:"20",
+        //     stockSum:"20"
+        // });
+        // materialList.push({
+        //     orderSheetCode:"G10001",
+        //     materialCode:"10001",
+        //     materialName:"物料A",
+        //     specs:"3*4",
+        //     needSum:"20",
+        //     stockSum:"20"
+        // });
+        // materialList.push({
+        //     orderSheetCode:"G10004",
+        //     materialCode:"10005",
+        //     materialName:"物料E",
+        //     specs:"3*4",
+        //     needSum:"20",
+        //     stockSum:"20"
+        // });
+
+        var materialList=MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getListByOrderSheet?type=1");
+
+        materialList.forEach(element => {
+            element.orderSheetCode=element.mocode
+            element.materialCode=element.cinvcode
+            element.materialName=""//element.cinvname
+            element.specs=""//element.cinvstd
+            element.needSum=element.materialPreparationTotal
+            element.stockSum=element.materialPreparationNumber
         });
+        
         return materialList;
 
     },
     // 工单缺料
     getListByOrderSheetNotEnough:function(){
-        const materialList = [];
-        materialList.push({
-            orderSheetCode:"G10001",
-            materialCode:"10001",
-            materialName:"物料A",
-            specs:"3*4",
-            needSum:"30",
-            stockSum:"20"
-        });
-        materialList.push({
-            orderSheetCode:"G10001",
-            materialCode:"10002",
-            materialName:"物料B",
-            specs:"3*4",
-            needSum:"55",
-            stockSum:"30"
-        });
-        materialList.push({
-            orderSheetCode:"G10002",
-            materialCode:"10003",
-            materialName:"物料C",
-            specs:"3*4",
-            needSum:"40",
-            stockSum:"20"
-        });
-        materialList.push({
-            orderSheetCode:"G10003",
-            materialCode:"10004",
-            materialName:"物料D",
-            specs:"3*4",
-            needSum:"40",
-            stockSum:"30"
-        });
-        materialList.push({
-            orderSheetCode:"G10004",
-            materialCode:"10005",
-            materialName:"物料E",
-            specs:"3*4",
-            needSum:"25",
-            stockSum:"20"
+        // const materialList = [];
+        // materialList.push({
+        //     orderSheetCode:"G10001",
+        //     materialCode:"10001",
+        //     materialName:"物料A",
+        //     specs:"3*4",
+        //     needSum:"30",
+        //     stockSum:"20"
+        // });
+        // materialList.push({
+        //     orderSheetCode:"G10001",
+        //     materialCode:"10002",
+        //     materialName:"物料B",
+        //     specs:"3*4",
+        //     needSum:"55",
+        //     stockSum:"30"
+        // });
+        // materialList.push({
+        //     orderSheetCode:"G10002",
+        //     materialCode:"10003",
+        //     materialName:"物料C",
+        //     specs:"3*4",
+        //     needSum:"40",
+        //     stockSum:"20"
+        // });
+        // materialList.push({
+        //     orderSheetCode:"G10003",
+        //     materialCode:"10004",
+        //     materialName:"物料D",
+        //     specs:"3*4",
+        //     needSum:"40",
+        //     stockSum:"30"
+        // });
+        // materialList.push({
+        //     orderSheetCode:"G10004",
+        //     materialCode:"10005",
+        //     materialName:"物料E",
+        //     specs:"3*4",
+        //     needSum:"25",
+        //     stockSum:"20"
+        // });
+        var materialList=MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getListByOrderSheet?type=2");
+
+        materialList.forEach(element => {
+            element.orderSheetCode=element.mocode
+            element.materialCode=element.cinvcode
+            element.materialName=""//element.cinvname
+            element.specs=""//element.cinvstd
+            element.needSum=element.materialPreparationTotal
+            element.stockSum=element.materialPreparationNumber
         });
+        
         return materialList;
 
     },
@@ -442,47 +465,58 @@ var ServiceMaterial={
     },
     // 领料申请通知
     getApplyList:function(){
-        const materialList = [];
-        materialList.push({
-            orderSheetCode:"G10001",
-            materialCode:"10001",
-            materialName:"物料A",
-            specs:"3*4",
-            applyPerson:"张三",
-            applysum:"20"
-        });
-        materialList.push({
-            orderSheetCode:"G10001",
-            materialCode:"10002",
-            materialName:"物料B",
-            specs:"3*4",
-            applyPerson:"张三",
-            applysum:"20"
-        });
-        materialList.push({
-            orderSheetCode:"G10002",
-            materialCode:"10003",
-            materialName:"物料C",
-            specs:"3*4",
-            applyPerson:"张三",
-            applysum:"20"
-        });
-        materialList.push({
-            orderSheetCode:"G10003",
-            materialCode:"10004",
-            materialName:"物料D",
-            specs:"3*4",
-            applyPerson:"张三",
-            applysum:"20"
-        });
-        materialList.push({
-            orderSheetCode:"G10004",
-            materialCode:"10005",
-            materialName:"物料E",
-            specs:"3*4",
-            applyPerson:"张三",
-            applysum:"20"
+        // const materialList = [];
+        // materialList.push({
+        //     orderSheetCode:"G10001",
+        //     materialCode:"10001",
+        //     materialName:"物料A",
+        //     specs:"3*4",
+        //     applyPerson:"张三",
+        //     applysum:"20"
+        // });
+        // materialList.push({
+        //     orderSheetCode:"G10001",
+        //     materialCode:"10002",
+        //     materialName:"物料B",
+        //     specs:"3*4",
+        //     applyPerson:"张三",
+        //     applysum:"20"
+        // });
+        // materialList.push({
+        //     orderSheetCode:"G10002",
+        //     materialCode:"10003",
+        //     materialName:"物料C",
+        //     specs:"3*4",
+        //     applyPerson:"张三",
+        //     applysum:"20"
+        // });
+        // materialList.push({
+        //     orderSheetCode:"G10003",
+        //     materialCode:"10004",
+        //     materialName:"物料D",
+        //     specs:"3*4",
+        //     applyPerson:"张三",
+        //     applysum:"20"
+        // });
+        // materialList.push({
+        //     orderSheetCode:"G10004",
+        //     materialCode:"10005",
+        //     materialName:"物料E",
+        //     specs:"3*4",
+        //     applyPerson:"张三",
+        //     applysum:"20"
+        // });
+        var materialList=MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getApplyList?type=2");
+
+        materialList.forEach(element => {
+            element.orderSheetCode=element.mocode
+            element.materialCode=element.cinvcode
+            element.materialName=""//element.cinvname
+            element.specs=""//element.cinvstd
+            element.applyPerson=""
+            element.applysum=element.unfinishedQuantity
         });
+        
         return materialList;
 
     },
@@ -573,7 +607,8 @@ var ServiceMaterial={
     },
     // 未入库总批数
     getNotInSum:function(){
-        return 90;
+        // return 90;
+        return MethodGetService.methodGet("/fbsPuArrivalvouch/fbsPuArrivalvouch/getNotInSum");
     },
     
     // 近6个月质量目标合格率比较（品质管理看板）
@@ -640,14 +675,15 @@ var ServiceMaterial={
     },
     // 当月检验合格率
     getCheckRateByBatchno: function () {
-        return {
-            "07001":98,
-            "07002":95,
-            "07003":94,
-            "07004":93,
-            "07005":99,
-            "07006":97
-        }
+        // return {
+        //     "07001":98,
+        //     "07002":95,
+        //     "07003":94,
+        //     "07004":93,
+        //     "07005":99,
+        //     "07006":97
+        // }
+        return MethodGetService.methodGet("/fbsPuArrivalvouch/fbsPuArrivalvouch/getCheckRateByBatchno");
     },
     // 未来几天内到货计划
     getQualityUnpassList:function(days){

js/service/produce-task.js

@@ -23,87 +23,101 @@ var ServiceProduceTask = {
     },
     // 月度生产计划
     getMonthList: function () {
-        const taskList = [];
-        taskList.push({
-            projectName: "项目1",
-            orderSheetCode: "G10001",
-            materialCode: "10001",
-            materialName: "物料A",
-            specs: "3*4",
-            planSum: 30,
-            workHour: 60,
-            completeSum: 15
-        });
-        taskList.push({
-            projectName: "项目1",
-            orderSheetCode: "G10002",
-            materialCode: "10002",
-            materialName: "物料B",
-            specs: "3*4",
-            planSum: 20,
-            workHour: 50,
-            completeSum: 18
-        });
-        taskList.push({
-            projectName: "项目1",
-            orderSheetCode: "G10003",
-            materialCode: "10003",
-            materialName: "物料C",
-            specs: "3*4",
-            planSum: 90,
-            workHour: 10,
-            completeSum: 60
-        });
-        taskList.push({
-            projectName: "项目1",
-            orderSheetCode: "G10001",
-            materialCode: "10001",
-            materialName: "物料A",
-            specs: "3*4",
-            planSum: 30,
-            workHour: 60,
-            completeSum: 15
-        });
-        taskList.push({
-            projectName: "项目1",
-            orderSheetCode: "G10002",
-            materialCode: "10002",
-            materialName: "物料B",
-            specs: "3*4",
-            planSum: 20,
-            workHour: 50,
-            completeSum: 18
-        });
-        taskList.push({
-            projectName: "项目1",
-            orderSheetCode: "G10003",
-            materialCode: "10003",
-            materialName: "物料C",
-            specs: "3*4",
-            planSum: 90,
-            workHour: 10,
-            completeSum: 60
-        });
-        taskList.push({
-            projectName: "项目1",
-            orderSheetCode: "G10001",
-            materialCode: "10001",
-            materialName: "物料A",
-            specs: "3*4",
-            planSum: 30,
-            workHour: 60,
-            completeSum: 15
-        });
-        taskList.push({
-            projectName: "项目1",
-            orderSheetCode: "G10002",
-            materialCode: "10002",
-            materialName: "物料B",
-            specs: "3*4",
-            planSum: 20,
-            workHour: 50,
-            completeSum: 18
-        });
+        // const taskList = [];
+        // taskList.push({
+        //     projectName: "项目1",
+        //     orderSheetCode: "G10001",
+        //     materialCode: "10001",
+        //     materialName: "物料A",
+        //     specs: "3*4",
+        //     planSum: 30,
+        //     workHour: 60,
+        //     completeSum: 15
+        // });
+        // taskList.push({
+        //     projectName: "项目1",
+        //     orderSheetCode: "G10002",
+        //     materialCode: "10002",
+        //     materialName: "物料B",
+        //     specs: "3*4",
+        //     planSum: 20,
+        //     workHour: 50,
+        //     completeSum: 18
+        // });
+        // taskList.push({
+        //     projectName: "项目1",
+        //     orderSheetCode: "G10003",
+        //     materialCode: "10003",
+        //     materialName: "物料C",
+        //     specs: "3*4",
+        //     planSum: 90,
+        //     workHour: 10,
+        //     completeSum: 60
+        // });
+        // taskList.push({
+        //     projectName: "项目1",
+        //     orderSheetCode: "G10001",
+        //     materialCode: "10001",
+        //     materialName: "物料A",
+        //     specs: "3*4",
+        //     planSum: 30,
+        //     workHour: 60,
+        //     completeSum: 15
+        // });
+        // taskList.push({
+        //     projectName: "项目1",
+        //     orderSheetCode: "G10002",
+        //     materialCode: "10002",
+        //     materialName: "物料B",
+        //     specs: "3*4",
+        //     planSum: 20,
+        //     workHour: 50,
+        //     completeSum: 18
+        // });
+        // taskList.push({
+        //     projectName: "项目1",
+        //     orderSheetCode: "G10003",
+        //     materialCode: "10003",
+        //     materialName: "物料C",
+        //     specs: "3*4",
+        //     planSum: 90,
+        //     workHour: 10,
+        //     completeSum: 60
+        // });
+        // taskList.push({
+        //     projectName: "项目1",
+        //     orderSheetCode: "G10001",
+        //     materialCode: "10001",
+        //     materialName: "物料A",
+        //     specs: "3*4",
+        //     planSum: 30,
+        //     workHour: 60,
+        //     completeSum: 15
+        // });
+        // taskList.push({
+        //     projectName: "项目1",
+        //     orderSheetCode: "G10002",
+        //     materialCode: "10002",
+        //     materialName: "物料B",
+        //     specs: "3*4",
+        //     planSum: 20,
+        //     workHour: 50,
+        //     completeSum: 18
+        // });
+
+        var taskList=MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getMonthList");
+        taskList.forEach(element=>{
+            element.projectName= "项目1",
+            element.orderSheetCode= element.mocode,
+            element.materialCode=element.cinvcode,
+            element.materialName=element.cinvname,
+            element.specs=element.cinvstd,
+            element.planSum=element.qty,
+            element.workHour= 50,
+            element.completeSum=element.qualifiedinqty
+        })
+        
+
         $.each(taskList, function (index, item) {
             item.incompleteSum = item.planSum - item.completeSum;
             if (item.incompleteSum < 0)
@@ -116,197 +130,210 @@ var ServiceProduceTask = {
     },
     // 日生产计划
     getDayList: function () {
-        const taskList = [];
-        taskList.push({
-            projectCode:"项目001",
-            orderSheetCode: "G10001",
-            materialCode: "10001",
-            materialName: "物料A",
-            specs: "3*4",
-            planSum: 30,
-            workHour: 60,
-            completeSum: 15
-        });
-        taskList.push({
-            projectCode:"项目001",
-            orderSheetCode: "G10002",
-            materialCode: "10002",
-            materialName: "物料B",
-            specs: "3*4",
-            planSum: 20,
-            workHour: 50,
-            completeSum: 18
-        });
-        taskList.push({
-            projectCode:"项目001",
-            orderSheetCode: "G10003",
-            materialCode: "10003",
-            materialName: "物料C",
-            specs: "3*4",
-            planSum: 90,
-            workHour: 10,
-            completeSum: 60
-        });
-        taskList.push({
-            projectCode:"项目001",
-            orderSheetCode: "G10001",
-            materialCode: "10001",
-            materialName: "物料A",
-            specs: "3*4",
-            planSum: 30,
-            workHour: 60,
-            completeSum: 15
-        });
-        taskList.push({
-            projectCode:"项目001",
-            orderSheetCode: "G10002",
-            materialCode: "10002",
-            materialName: "物料B",
-            specs: "3*4",
-            planSum: 20,
-            workHour: 50,
-            completeSum: 18
-        });
-        taskList.push({
-            projectCode:"项目001",
-            orderSheetCode: "G10003",
-            materialCode: "10003",
-            materialName: "物料C",
-            specs: "3*4",
-            planSum: 90,
-            workHour: 10,
-            completeSum: 60
-        });
-        taskList.push({
-            projectCode:"项目001",
-            orderSheetCode: "G10001",
-            materialCode: "10001",
-            materialName: "物料A",
-            specs: "3*4",
-            planSum: 30,
-            workHour: 60,
-            completeSum: 15
-        });
-        taskList.push({
-            projectCode:"项目001",
-            orderSheetCode: "G10002",
-            materialCode: "10002",
-            materialName: "物料B",
-            specs: "3*4",
-            planSum: 20,
-            workHour: 50,
-            completeSum: 18
-        });
-        taskList.push({
-            projectCode:"项目001",
-            orderSheetCode: "G10001",
-            materialCode: "10001",
-            materialName: "物料A",
-            specs: "3*4",
-            planSum: 30,
-            workHour: 60,
-            completeSum: 15
-        });
-        taskList.push({
-            projectCode:"项目001",
-            orderSheetCode: "G10002",
-            materialCode: "10002",
-            materialName: "物料B",
-            specs: "3*4",
-            planSum: 20,
-            workHour: 50,
-            completeSum: 18
-        });
-        taskList.push({
-            projectCode:"项目001",
-            orderSheetCode: "G10003",
-            materialCode: "10003",
-            materialName: "物料C",
-            specs: "3*4",
-            planSum: 90,
-            workHour: 10,
-            completeSum: 60
-        });
-        taskList.push({
-            projectCode:"项目001",
-            orderSheetCode: "G10001",
-            materialCode: "10001",
-            materialName: "物料A",
-            specs: "3*4",
-            planSum: 30,
-            workHour: 60,
-            completeSum: 15
-        });
-        taskList.push({
-            projectCode:"项目001",
-            orderSheetCode: "G10002",
-            materialCode: "10002",
-            materialName: "物料B",
-            specs: "3*4",
-            planSum: 20,
-            workHour: 50,
-            completeSum: 18
-        });
-        taskList.push({
-            projectCode:"项目001",
-            orderSheetCode: "G10003",
-            materialCode: "10003",
-            materialName: "物料C",
-            specs: "3*4",
-            planSum: 90,
-            workHour: 10,
-            completeSum: 60
-        });
-        taskList.push({
-            projectCode:"项目001",
-            orderSheetCode: "G10001",
-            materialCode: "10001",
-            materialName: "物料A",
-            specs: "3*4",
-            planSum: 30,
-            workHour: 60,
-            completeSum: 15
-        });
-        taskList.push({
-            projectCode:"项目001",
-            orderSheetCode: "G10002",
-            materialCode: "10002",
-            materialName: "物料B",
-            specs: "3*4",
-            planSum: 20,
-            workHour: 50,
-            completeSum: 18
-        });
-        taskList.push({
-            projectCode:"项目001",
-            orderSheetCode: "G10001",
-            materialCode: "10001",
-            materialName: "物料A",
-            specs: "3*4",
-            planSum: 30,
-            workHour: 60,
-            completeSum: 15
-        });
-        taskList.push({
-            projectCode:"项目001",
-            orderSheetCode: "G10002",
-            materialCode: "10002",
-            materialName: "物料B",
-            specs: "3*4",
-            planSum: 20,
-            workHour: 50,
-            completeSum: 18
-        });
-        taskList.push({
-            projectCode:"项目001",
-            orderSheetCode: "G10003",
-            materialCode: "10003",
-            materialName: "物料C",
-            specs: "3*4",
-            planSum: 90,
-            workHour: 10,
-            completeSum: 60
-        });
+        // const taskList = [];
+        // taskList.push({
+        //     projectCode:"项目001",
+        //     orderSheetCode: "G10001",
+        //     materialCode: "10001",
+        //     materialName: "物料A",
+        //     specs: "3*4",
+        //     planSum: 30,
+        //     workHour: 60,
+        //     completeSum: 15
+        // });
+        // taskList.push({
+        //     projectCode:"项目001",
+        //     orderSheetCode: "G10002",
+        //     materialCode: "10002",
+        //     materialName: "物料B",
+        //     specs: "3*4",
+        //     planSum: 20,
+        //     workHour: 50,
+        //     completeSum: 18
+        // });
+        // taskList.push({
+        //     projectCode:"项目001",
+        //     orderSheetCode: "G10003",
+        //     materialCode: "10003",
+        //     materialName: "物料C",
+        //     specs: "3*4",
+        //     planSum: 90,
+        //     workHour: 10,
+        //     completeSum: 60
+        // });
+        // taskList.push({
+        //     projectCode:"项目001",
+        //     orderSheetCode: "G10001",
+        //     materialCode: "10001",
+        //     materialName: "物料A",
+        //     specs: "3*4",
+        //     planSum: 30,
+        //     workHour: 60,
+        //     completeSum: 15
+        // });
+        // taskList.push({
+        //     projectCode:"项目001",
+        //     orderSheetCode: "G10002",
+        //     materialCode: "10002",
+        //     materialName: "物料B",
+        //     specs: "3*4",
+        //     planSum: 20,
+        //     workHour: 50,
+        //     completeSum: 18
+        // });
+        // taskList.push({
+        //     projectCode:"项目001",
+        //     orderSheetCode: "G10003",
+        //     materialCode: "10003",
+        //     materialName: "物料C",
+        //     specs: "3*4",
+        //     planSum: 90,
+        //     workHour: 10,
+        //     completeSum: 60
+        // });
+        // taskList.push({
+        //     projectCode:"项目001",
+        //     orderSheetCode: "G10001",
+        //     materialCode: "10001",
+        //     materialName: "物料A",
+        //     specs: "3*4",
+        //     planSum: 30,
+        //     workHour: 60,
+        //     completeSum: 15
+        // });
+        // taskList.push({
+        //     projectCode:"项目001",
+        //     orderSheetCode: "G10002",
+        //     materialCode: "10002",
+        //     materialName: "物料B",
+        //     specs: "3*4",
+        //     planSum: 20,
+        //     workHour: 50,
+        //     completeSum: 18
+        // });
+        // taskList.push({
+        //     projectCode:"项目001",
+        //     orderSheetCode: "G10001",
+        //     materialCode: "10001",
+        //     materialName: "物料A",
+        //     specs: "3*4",
+        //     planSum: 30,
+        //     workHour: 60,
+        //     completeSum: 15
+        // });
+        // taskList.push({
+        //     projectCode:"项目001",
+        //     orderSheetCode: "G10002",
+        //     materialCode: "10002",
+        //     materialName: "物料B",
+        //     specs: "3*4",
+        //     planSum: 20,
+        //     workHour: 50,
+        //     completeSum: 18
+        // });
+        // taskList.push({
+        //     projectCode:"项目001",
+        //     orderSheetCode: "G10003",
+        //     materialCode: "10003",
+        //     materialName: "物料C",
+        //     specs: "3*4",
+        //     planSum: 90,
+        //     workHour: 10,
+        //     completeSum: 60
+        // });
+        // taskList.push({
+        //     projectCode:"项目001",
+        //     orderSheetCode: "G10001",
+        //     materialCode: "10001",
+        //     materialName: "物料A",
+        //     specs: "3*4",
+        //     planSum: 30,
+        //     workHour: 60,
+        //     completeSum: 15
+        // });
+        // taskList.push({
+        //     projectCode:"项目001",
+        //     orderSheetCode: "G10002",
+        //     materialCode: "10002",
+        //     materialName: "物料B",
+        //     specs: "3*4",
+        //     planSum: 20,
+        //     workHour: 50,
+        //     completeSum: 18
+        // });
+        // taskList.push({
+        //     projectCode:"项目001",
+        //     orderSheetCode: "G10003",
+        //     materialCode: "10003",
+        //     materialName: "物料C",
+        //     specs: "3*4",
+        //     planSum: 90,
+        //     workHour: 10,
+        //     completeSum: 60
+        // });
+        // taskList.push({
+        //     projectCode:"项目001",
+        //     orderSheetCode: "G10001",
+        //     materialCode: "10001",
+        //     materialName: "物料A",
+        //     specs: "3*4",
+        //     planSum: 30,
+        //     workHour: 60,
+        //     completeSum: 15
+        // });
+        // taskList.push({
+        //     projectCode:"项目001",
+        //     orderSheetCode: "G10002",
+        //     materialCode: "10002",
+        //     materialName: "物料B",
+        //     specs: "3*4",
+        //     planSum: 20,
+        //     workHour: 50,
+        //     completeSum: 18
+        // });
+        // taskList.push({
+        //     projectCode:"项目001",
+        //     orderSheetCode: "G10001",
+        //     materialCode: "10001",
+        //     materialName: "物料A",
+        //     specs: "3*4",
+        //     planSum: 30,
+        //     workHour: 60,
+        //     completeSum: 15
+        // });
+        // taskList.push({
+        //     projectCode:"项目001",
+        //     orderSheetCode: "G10002",
+        //     materialCode: "10002",
+        //     materialName: "物料B",
+        //     specs: "3*4",
+        //     planSum: 20,
+        //     workHour: 50,
+        //     completeSum: 18
+        // });
+        // taskList.push({
+        //     projectCode:"项目001",
+        //     orderSheetCode: "G10003",
+        //     materialCode: "10003",
+        //     materialName: "物料C",
+        //     specs: "3*4",
+        //     planSum: 90,
+        //     workHour: 10,
+        //     completeSum: 60
+        // });
+
+        var taskList=MethodGetService.methodGet("/fbsMomOrder/fbsMomOrderdetail/getDayList");
+        taskList.forEach(element=>{
+            element.projectName= "项目1",
+            element.orderSheetCode= element.mocode,
+            element.materialCode=element.cinvcode,
+            element.materialName=element.cinvname,
+            element.specs=element.cinvstd,
+            element.planSum=element.qty,
+            element.workHour= 50,
+            element.completeSum=element.qualifiedinqty
+        })
+
         $.each(taskList, function (index, item) {
             item.incompleteSum = item.planSum - item.completeSum;
             if (item.incompleteSum < 0)

js/service/product.js

@@ -168,7 +168,8 @@ var ServiceProduct = {
         //     "分类F": 200,
         //     "分类G": 400
         // };
-        return MethodGetService.methodGet("/fbsAbnormalWorkingHours/fbsAbnormalWorkingHours/getQualityType");
+        // return MethodGetService.methodGet("/fbsAbnormalWorkingHours/fbsAbnormalWorkingHours/getQualityType");
+        return MethodGetService.methodGet("/fbsAbnormalWorkingHours/fbsAbnormalWorkingHoursDescribe/getMonthExceptionByCategory");
     },
     // 周成品入库数量，根据分类
     getWeekInByCategory: function () {

js/service/workhour.js

@@ -6,7 +6,8 @@
 var ServiceWorkhour={
     // 根据物料统计
     getByMaterial:function(){
-        return MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getProductHoursMonthReport");
+        return MethodGetService.methodGet("/workingStatistics/fbsWorkingStatistics/getByMaterial");
+        // return MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getProductHoursMonthReport");
         // return {
         //     "物料A 20*30":250,
         //     "物料B 20*35":250,
@@ -22,7 +23,8 @@ var ServiceWorkhour={
         //     "物料C":200,
         //     "物料D":400,
         // };
-        return MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getProductHoursMonthReport?type=1");
+        return MethodGetService.methodGet("/workingStatistics/fbsWorkingStatistics/getByMaterial?type=1");
+        // return MethodGetService.methodGet("/fbsWorkshopDispatchList/fbsWorkshopDispatchList/getByMaterial?type=1");
     },
     // 获取物料的标准工时和实际工时
     getStandAndRealByMaterial:function(){