工单作业、工单查询、报工查询

src/config/getData2.js

@@ -25,12 +25,53 @@ export const openStart = (id, code) => post('api/produceshiftorder/openStart', {
 })
 
 // 4.设备报工
-export const saveReport = (id, code) => post('api/produceshiftorder/saveReport', {
+export const saveReport = (id, qty, nqty, rqty) => post('api/produceshiftorder/saveReport', {
   workorder_id: id,
-  report_qty: code
+  report_qty: qty,
+  nok_qty: nqty,
+  repare_qty: rqty
 })
 
 // 5.设备完工
 export const tofinish = (row) => post('api/produceshiftorder/finish', {
   row: row
 })
+
+// 设备下拉列表
+export const deviceList = (search) => post('api/device/list', {
+  search: search
+})
+// export const deviceList = (search) => {
+//   let res = {
+//     'totalElements': 4,
+//     'content': [
+//       {
+//         'device_name': 'A1_旋压下料_80_1',
+//         'device_code': 'A1_XY_80_1'
+//       },
+//       {
+//         'device_name': 'A1_旋压下料_80_2',
+//         'device_code': 'A1_XY_80_2'
+//       },
+//       {
+//         'device_name': 'A1_旋压下料_80_3',
+//         'device_code': 'A1_XY_80_3'
+//       },
+//       {
+//         'device_name': 'A1_旋压下料_80_4',
+//         'device_code': 'A1_XY_80_4'
+//       }
+//     ],
+//     'code': 200,
+//     'msg': '查询成功'
+//   }
+//   return res
+// }
+
+// 报工查询
+export const reportQuery = (st, et, code, wcode) => post('api/produceWorkorder/reportQuery', {
+  start_time: st,
+  end_time: et,
+  device_code: code,
+  workorder_code: wcode
+})

src/config/utils.js

@@ -69,3 +69,81 @@ export const dateTimeFtt = date => {
   let ss = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
   return `${year}-${month}-${day} ${hh}:${mm}:${ss}`
 }
+
+/**
+ * 小数加法
+ */
+export const accAdd = (arg1, arg2) => {
+  var r1, r2, m, c
+  try {
+    r1 = arg1.toString().split('.')[1].length
+  } catch (e) {
+    r1 = 0
+  }
+  try {
+    r2 = arg2.toString().split('.')[1].length
+  } catch (e) {
+    r2 = 0
+  }
+  c = Math.abs(r1 - r2)
+  m = Math.pow(10, Math.max(r1, r2))
+  if (c > 0) {
+    var cm = Math.pow(10, c)
+    if (r1 > r2) {
+      arg1 = Number(arg1.toString().replace('.', ''))
+      arg2 = Number(arg2.toString().replace('.', '')) * cm
+    } else {
+      arg1 = Number(arg1.toString().replace('.', '')) * cm
+      arg2 = Number(arg2.toString().replace('.', ''))
+    }
+  } else {
+    arg1 = Number(arg1.toString().replace('.', ''))
+    arg2 = Number(arg2.toString().replace('.', ''))
+  }
+  return (arg1 + arg2) / m
+}
+
+/**
+ * 小数减法
+ */
+export const accSubtract = (arg1, arg2) => {
+  var r1, r2, m, c
+  try {
+    r1 = arg1.toString().split('.')[1].length
+  } catch (e) {
+    r1 = 0
+  }
+  try {
+    r2 = arg2.toString().split('.')[1].length
+  } catch (e) {
+    r2 = 0
+  }
+  c = Math.abs(r1 - r2)
+  m = Math.pow(10, Math.max(r1, r2))
+  if (c > 0) {
+    var cm = Math.pow(10, c)
+    if (r1 > r2) {
+      arg1 = Number(arg1.toString().replace('.', ''))
+      arg2 = Number(arg2.toString().replace('.', '')) * cm
+    } else {
+      arg1 = Number(arg1.toString().replace('.', '')) * cm
+      arg2 = Number(arg2.toString().replace('.', ''))
+    }
+  } else {
+    arg1 = Number(arg1.toString().replace('.', ''))
+    arg2 = Number(arg2.toString().replace('.', ''))
+  }
+  return (arg1 - arg2) / m
+}
+
+/**
+ * 小数乘法
+ */
+export const accMul = (arg1, arg2) => {
+  var m = 0
+  var s1 = arg1.toString()
+  var s2 = arg2.toString()
+  try { m += s1.split('.')[1].length } catch (e) {}
+  try { m += s2.split('.')[1].length } catch (e) {}
+  return Number(s1.replace('.', '')) * Number(s2.replace('.', '')) / Math.pow(10, m)
+}