Merge branch 'master' of ssh://123.56.95.229:29418/高精

src/api/Inventory/MaterialOut.js

@@ -231,3 +231,18 @@ export function selectleaders(department) {
     }
   })
 }
+// 领料单查询
+export function searchList222(pageCurrent, pageSize, listPeople_check) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间装配管理_领料单明细_查询数据_新2',
+      param: '图号=' + listPeople_check,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}

src/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js

@@ -42,7 +42,7 @@ export function searchtable(check1, value1, check3, value3, check5, value5, valu
     }
   })
 }
-export function editSpare(CutCode, number, id) {
+export function editSpare(CutCode, number, id, Unqualified, remarkGroup, people) {
   return request({
     url: '',
     method: 'post',
@@ -51,7 +51,7 @@ export function editSpare(CutCode, number, id) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '报废补投_提交报废_循环执行',
-      param: '工艺计划流水号组=' + CutCode + '&报废数量组=' + number + '&报废人=' + id
+      param: '工艺计划流水号组=' + CutCode + '&报废数量组=' + number + '&报废人=' + id + '&不合格原因组=' + Unqualified + '&备注组=' + remarkGroup + '&质检人组=' + people
     }
   })
 }