From e672f1abe84aa0333b4c27e59826522c0e52563f Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Thu, 22 Feb 2024 10:26:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/home/home.vue | 2 +- static/image/menu/RF03.png | Bin 2097 -> 3110 bytes utils/getData2.js | 131 ++++++------------------------------- 3 files changed, 21 insertions(+), 112 deletions(-) diff --git a/pages/home/home.vue b/pages/home/home.vue index 5f655b6..7a851e6 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -32,7 +32,7 @@ return { userName: '', menuList: [ - {id: '1', name: '人工排产', icon: 'RF01', path: '/pages/manage/man-group-disk'}, + {id: '1', name: '人工排产', icon: 'RF01', path: '/pages/modules/equip-inspection'}, {id: '2', name: '涂线板', icon: 'RF02', path: '/pages/manage/man-group-disk'}, {id: '3', name: '物料库存', icon: 'RF03', path: '/pages/manage/man-group-disk'} ] diff --git a/static/image/menu/RF03.png b/static/image/menu/RF03.png index 1bc47ed7a441d8deaedfa51fffc4d1fe364d72b3..796026f592816f4b7081c16a55b2cbb9411a7626 100644 GIT binary patch delta 2393 zcmaLZdpHvc9|v&OtP$Bp;xM_CTQ0-g=3qBdN-iy>+$)E2H)GM6%VOj{#gTPbWJk5a zD52gn_may&WRn(Y5*h6nqW8S-^S;mf*Li>cem~Feuix{0e+`hk>W_{C4&V^3cmmSS z5{q%QwzPD$$5`Qz4oGWjD#^#}JdJJ_lTmB)Y2Jj@t79nmMd?Ha8TIK}TOoZ&5YkR_Qr={V-Erl_tgJ zvj`rFvSK-T;3zter+fsh3Rbs4pHonsI%`r3%g;zt+nlTIYvNxy@x|^>(wpVzg`0wD z=4fhb)A}GYW$o1f<&}Rd5{Wd@r!HB9WC3to-6^{66eNmn8%npuYg*zpSxO@W#gVLV z{jBhRrG1G-^cGtP?t2k3gdk}Xj#V68{bxwC0d`sR5oFE^>4-cF1=+ld&KOB6%mOM0;i#~*^e3XSK zTG0+E4p8Uhf9S9E?eblkpN%(Y^OU^huHH5-+f^)51~a^G%X0~XkP>iND*G0CQgpd< zid7(yVKhNx7l2>G^zgHsI5Ii|DCg^*k-NgSHu zb$t@mxVOPxMX!OdKMD`?ki3hD+jBba?pa0}Tu^*GER3N}mPoE%+B5p{4udmUEE)nE zBg_NPEoQEoxS!5@sov#jDdqR}(A|s;l90laynAGQlt=QuZ$0aB7~rT8kJAP~!I4<;F24q7*SH$q2Xzdk%B(nq=bL0X@q&F&fG*FYU{W=7r`qtO44aRo(#QH zvHeFKqU4RF%~dc_h{$|&b44@6LJ0NWN?$3aYK(ZSst9GVt$j|hHRUpY`1$5;M(UiD zUx%nY zL&tYk`x(ENzM~z2&X7%8Ua)fFA1{A6$aJ}k1a~7UicJJI_DlZNn zp1EV41l#d`Z3WF1eF>h+PN8%eS6f-d&XE?)NyNTnxSv^Gm+^}8>-XzxH1B9$!s*{2 zm}7fU?-877P}vHQldU=;ugwwXQrEYfrF@D`f%y6@R4;K9rGKw*Je^&~cSl-?yINQ~ za_nNQDqvu?VTi@7U#Vf52uAW*_p;1t4df)u7c`OAN}F|J^#Ke|aCh{PdH+8ASYg6i zo|t!NU{5Xd)t%KiahvQ$zE)mW0PkV+!bZQB{KD`o>dO5Lr9L%Di~;qlp%!n$xEf1p z(PRdEx(HIbrVt!Txky}o{!VV>fv6@C>jYPo^~lmeAqgapPoMSY-oy9h=qBNnWgIlX zC{|bVG4<_MoyY1UwT}C2&Zu|oLsUL!hRQODFVuQ+`~9yOJ0EyH8=%L-3ZFIXJQK}Y z2g2}=h zYWG0~x?GO9fvGKGlLlz%Iwg_~4InxvlvoBTaak(#&$jioG8E#&mviPgu@bf4EjXuM z*AMK`*#L*7eXYB3%>L)&_yUXzt9i4i$K<64vw(NwR+_&Xb$48cJJ9O*CvUr<;Wi)1 z{#}Xe84DskOk(KrP|JZrh4QJqO)#7b}}MB7FeI7^ZO2E_QCA4IX4S0!u!Ag{9W_bbfvJjstY+R<|-o}47KQOLuE zA}24U;@D|v6Y%Xl0-|L1_U(N72$di91@$DALE9YeKU}x^EL24m|7$Ou zfhx_p?b=6c5Y$zad~1svYGxZ9<+eb(MS`l+aL&myj1^AfpYO!s+IxeN@9i&f+>k21 z7Ec2(SEaYYH42&<-s7EPmZlV$f)a#Z<+(rwYK3G4ZZ`H|{43-A_Gs4;WewJzYYm@d zsGd9~2}6=rHUm2SKYNo_W*Y1H>1To-8RbBQhgo&d{Zz-=PWhMQp22iGeHkKw^^BUc}0BHjXlrr z-F$lR36TvkD=UXVG2PoBTr@i1d1WM zBp_pQ#Zn?W|2>% zYjk{`0C+&)-oXrZ40DUxBavP=+W`chbz}^HQgYxqI{|({fzz~^#r825PQ^n`X$spB zxamBK^P08zjdrCX2x_z12+s)1AE0}LVo{_md0aiRb33s|0Wkp;=T0KtaW3aLNK{53~iPvAM& H;EaC)Nz`r5 delta 1372 zcmZ1`u~A@y50kv1vyp|Vv5AF=rKyFXp{u2(ft!hirHhlHfuVt$x!dGyCRvyoOI&J} zGa16vnBh|M9bt|+E;Yu?&h=VMr3DNOEb~2G978H@y_u7l)8i;{{CVy6Rg3y|1gSJx zHSxCyq;mv@x9oV;W7V|obN3e4r5OV56Et+2OiJBl3cY_gG)+=?wc<5*P^Uo4k&CPT zU!J?oqx|B&<9n>n+yDH2_ikqTw*52D{XS#7+4Rz-ODw1BX7)5V8fS<#r(NKwpLKMB zq)9iB%XT*D0uP9{K6tExV!5SjTd{V1ezcBda$BzkbOy z%c*|L=?`){8V~0NFMoD8I5oXp^@WCo>^|=Ar61SNuqxND@hq!~XzZJO@ko$po=?!< zjCbdJq-M{XXrp)P^@7Z=Wde5m+d~Y}`lrmDKYgZ<{Bzd}A@5@uiq1< zvbgQG*%osT)(ac!^&0rLP5RBl-y9!tCoWsmL0YfjoyPO03B~457uiSMh$~(H#Oh6i zl{^=t0>2!$_^MBBdu!G$=HH|5a;J{bFXh6u43j;YE|#jluCMywrYyo(#$6YBa(*t` z_lEVXn(<0Z)~`QWHUH!4Z#jSShTBGtoY{hJ@^<;jTIaUKtkVCGR6qCm3mf*^RV$5O znDK49>Y09F^8-D;Etfgs)_y)~5cNzq!~dh?pTlitQm0ZYW$zxgo*!e>zV*iudtl<# z=|6XIiu1X~`CQeTa!VgJ7WmI~tQUWpzWA-k+svS*%w6k(-Ip;>@H~2GE^kVzLww>&AaC7AF4n6^s&m1 zB?Zp|o?44OdQp>j|KOB+m-4jZTLo*qTK4;`W~f@;!*(e2OX3n)t%f>Yeg5PND>sKf z-4m$#>W0eW`vsTF9PX_Ns&KcKsH@o58`v?q%71^qeeL}FtGL#lxhI(8_2*6d@(zcf z`F8We?<*H*7JIym`o*7m^WT@h@7J!`<8o@j^Vo{mz%x5tXD$74YJ%ft36thDLttsJ nAd+Vmgm*y)%)6!dS0sU<`pIRUB@FU93_#%N>gTe~DWM4fY5#ed diff --git a/utils/getData2.js b/utils/getData2.js index 939aad5..b2ba1a4 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -23,56 +23,15 @@ export const handLogin = (user, password) => request({ }) /** - * 设备点检 + * 人工排产 */ -// 获取设备下拉框 -export const deviceInfo = () => request({ - url:'api/pda/deviceCheck/deviceInfo', - data: {} -}) -// 获取设备状态下拉框 -export const deviceStatus = () => request({ - url:'api/pda/deviceCheck/deviceStatus', - data: {} -}) -// 设备点检 -export const deviceCheckVerify = (code, user, remark, status) => request({ - url:'api/pda/deviceCheck/verify', - data: { - device_code: code, - username: user, - remark: remark, - check_status: status - } -}) - -/** - * 强制静置 - */ -// 显示静置信息 -export const forcedRestingShow = () => request({ - url:'api/pda/forcedResting/show', - data: {} -}) -// 强制静置 -export const forcedRestingSubmit = (stime, id) => request({ - url:'api/pda/forcedResting/submit', - data: { - stand_time: stime, - group_id: id - } -}) - -/** - * 分拣排产 - */ -// 显示工单/刷新 +// 工单 export const manualSortingOrders = () => request({ url:'api/pda/manualSorting/orders', data: {} }) // 开工 -export const manualSortingProductionScheduling = (code, user) => request({ +export const productionScheduling = (code, user) => request({ url:'api/pda/manualSorting/productionScheduling', data: { workorder_code: code, @@ -80,7 +39,7 @@ export const manualSortingProductionScheduling = (code, user) => request({ } }) // 完工 -export const manualSortingProductionComplete = (code, user) => request({ +export const productionComplete = (code, user) => request({ url:'api/pda/manualSorting/productionComplete', data: { workorder_code: code, @@ -89,84 +48,34 @@ export const manualSortingProductionComplete = (code, user) => request({ }) /** - * 剩料入库 + * 涂板线 */ -// 刷新 -export const callingResidueMaterialTaskShow = () => request({ - url:'api/pda/manualSorting/callingResidueMaterialTaskShow', +// 数据 +export const coatedWireIntoStorageTaskShow = () => request({ + url:'api/pda/manualSorting/coatedWireIntoStorageTaskShow', data: {} }) -// 确认 -export const callingResidueMaterialTask = (code, qty) => request({ - url:'api/pda/manualSorting/callingResidueMaterialTask', +// 入库 +export const coatedWireIntoStorageTask = (code, qty) => request({ + url:'api/pda/manualSorting/coatedWireIntoStorageTask', data: { - vehicle_code: code, + point_code: code, qty: qty } }) /** - * 托盘绑定 + * 物料库存 */ -// 确认 -export const manualSortingBindingVehicle = (ocode, tcode) => request({ - url:'api/pda/manualSorting/bindingVehicle', - data: { - origin_vehicle_code: ocode, - target_vehicle_code: tcode - } -}) - -/** - * 包装入库 - */ -// 刷新 -export const manualSortingPackingTaskShow = () => request({ - url:'api/pda/manualSorting/packingTaskShow', +// 物料下拉框 +export const materialList = () => request({ + url:'api/pda/materialList', data: {} }) -// 确认 -export const manualSortingPackingTask = (code, qty, sqty) => request({ - url:'/api/pda/manualSorting/packingTask', - data: { - vehicle_code: code, - qty: qty, - surplus_quantity: sqty - } -}) - -/** - * 货架盘点 - */ -// 物料查询 -export const shelfMaterialQuery = (code) => request({ - url:'api/pda/shelf/materialQuery', +// 根据物料获取库存数据 +export const getInventoryMaterialInfo = (code) => request({ + url:'api/pda/getInventoryMaterialInfo', data: { material_code: code } -}) -// 确认 -export const shelfUpdateData = (code, status, vcode, qty, id) => request({ - url:'api/pda/shelf/updateData', - data: { - point_code: code, - point_status: status, - vehicle_code: vcode, - material_qty: qty, - material_id: id - } -}) - -/** - * 混碾操作 - */ -// 获取要料信息 -export const mixRequestInfo = () => request({ - url:'api/pda/mix/requestInfo', - data: {} -}) -// 删除数据 -export const mixDeleteInfo = (obj) => request({ - url:'api/pda/mix/deleteInfo', - data: obj -}) +}) \ No newline at end of file