Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

src/api/BasicData/ShiftManagement.js

@@ -60,7 +60,7 @@ export function deleteShift(shiftCode) {
     }
   })
 }
-// 删除班次
+// 班次类型与工作时间增加
 export function addShiftType() {
   return request({
     url: '',

src/api/Inventory/InventoryCheck.js

@@ -212,14 +212,14 @@ export function searchHoursePurchasePart(pageCurrent, pageSize, project_check, p
   })
 }
 // 车间采购库存盘点修改
-export function CheckAlter(receive, project, machinenumber, partnumber, oldnumber, reason, number, people, locate, contractdetail, alterdate, craftnumber, materialType, materiallocate) {
+export function CheckAlter(receive, project, machinenumber, partnumber, oldnumber, reason, number, people, locate, contractdetail, craftnumber, materialType, materiallocate, name, mode, picture, type, material) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '库存管理_库存盘点_修改数量',
-      param: '收件信息ID=' + receive + '&项目流水号=' + project + '&机床流水号=' + machinenumber + '&组件流水号=' + partnumber + '&原数量=' + oldnumber + '&修改原因=' + reason + '&数量=' + number + '&人员编号=' + people + '&货位流水号=' + locate + '&采购合同明细流水号=' + contractdetail + '&工艺计划流水号=' + craftnumber + '&零件类型代码=' + materialType + '&物料与货位对照流水号=' + materiallocate
+      param: '收件信息ID=' + receive + '&项目流水号=' + project + '&机床流水号=' + machinenumber + '&组件流水号=' + partnumber + '&原数量=' + oldnumber + '&修改原因=' + reason + '&数量=' + number + '&人员编号=' + people + '&货位流水号=' + locate + '&采购合同明细流水号=' + contractdetail + '&工艺计划流水号=' + craftnumber + '&零件类型代码=' + materialType + '&物料与货位对照流水号=' + materiallocate + '&名称=' + name + '&规格=' + mode + '&图号=' + picture + '&型号=' + type + '&材料=' + material
     }
   })
 }

src/api/Inventory/PartOut.js

@@ -36,15 +36,28 @@ export function ListDetailOut(listNumber) {
     }
   })
 }
+// 交换件查询
+export function ExchangeOut(listNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '库存管理_零件出库_交换件查询',
+      param: '领料单流水号=' + listNumber
+    }
+  })
+}
+
 // 外购件零件出库
-export function PurchasePart(data1, data2, data3, data4, data5) {
+export function PurchasePart(data1, data2, data3, data4, data5, data6) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '库存管理_外购件出库_修改数据',
-      param: '采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5
+      param: '采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&物料与货位对照流水号=' + data5 + '&备注=' + data6
     }
   })
 }
@@ -61,18 +74,18 @@ export function BasicPart(data1, data2, data3, data4, data5) {
   })
 }
 // 车间采购件零件出库
-export function WorkShopPart(data1, data2, data3, data4, data5) {
+export function WorkShopPart(data1, data2, data3, data4, data5, data6) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '库存管理_车间采购出库_修改数据',
-      param: '请购单明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5
+      param: '请购单明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&物料与货位对照流水号=' + data5 + '&备注=' + data6
     }
   })
 }
-// 车间采购件零件出库
+// 异常出库
 export function ErrorOut(data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12) {
   return request({
     url: '',

src/api/ManufacturingCenter/MaterialArrivalManagement.js

@@ -49,3 +49,14 @@ export function handlechange(Number, code) {
     }
   })
 }
+export function change(Number, code, num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_备料到货更改',
+      param: '工序流水号组=' + Number + '&工作者考勤编号=' + code + '&工艺计划流水号组=' + num
+    }
+  })
+}