Skip to content

J
jyzb_platformV2
Commit 537013b1 by 李小惠
Options

修改orderMain数据结构

parent e8f1eb20
正在显示 包含 120 行增加 和 36 行删除
app-log/error/log-error-2024-01-26.0.log 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/error/log-error-2024-01-27.0.log 0 → 100644
2024-01-27 10:39:29.104 ERROR 24616 --- [http-nio-10030-exec-9] c.j.j.b.c.handle.GlobalExceptionHandler : >授权异常>>获取token失败，请检查header和param中是否传递了用户token
app-log/log_error.log
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/log_total.log
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/total/log-total-2024-01-26.0.log 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/total/log-total-2024-01-27.0.log 0 → 100644
2024-01-27 10:39:29.104 ERROR 24616 --- [http-nio-10030-exec-9] c.j.j.b.c.handle.GlobalExceptionHandler : >授权异常>>获取token失败，请检查header和param中是否传递了用户token
2024-01-27 11:39:50.107 INFO 24616 --- [Thread-19] c.j.v.l.e.service.impl.EsLogServiceImpl : [日志批量保存]|请求参数：[{"appName":"jyzb-app","clientBrowser":"Chrome","clientIp":"192.168.3.40","clientOs":"Windows 10 or Windows Server 2016","createTime":1706326787085,"httpMethod":"POST","logContent":"用户登录","logId":"ee046203-a6de-4901-9e87-253d7ff1e65e","logName":"API接口日志记录","logType":10,"requestParams":"{\"req\":{\"password\":\"123456\",\"createCookie\":false,\"rememberMe\":false,\"account\":\"nbcgy\"}}","requestResult":"{\"code\":99200,\"data\":{\"userInfo\":{\"buttonCodes\":[],\"userInfo\":{\"birthday\":1692892800000,\"nickName\":\"宁波仓管员\",\"sex\":\"M\",\"avatar\":10000,\"realName\":\"宁波仓管员\",\"phone\":\"15957116480\",\"email\":\"578776454@qq.com\"},\"orgName\":\"浙江省宁波市公安局\",\"userId\":1694954953210986498,\"orgId\":1369509498032811869,\"memberFlag\":false,\"roleInfoList\":[{\"roleId\":1528003832557232130,\"roleCode\":\"10099\",\"roleName\":\"仓管员\"}],\"wsUrl\":\"ws://localhost:8080/message/ws/1694954953210986498\",\"loginTime\":1706326786840,\"orgCode\":\"330200000000\",\"dataScopeOrgIds\":[],\"dataScopeUserIds\":[1694954953210986498],\"superAdmin\":false,\"account\":\"nbcgy\"},\"expireAt\":1706931586951,\"token\":\"eyJhbGciOiJIUzUxMiJ9.eyJ1c2VySWQiOjE2OTQ5NTQ5NTMyMTA5ODY0OTgsImFjY291bnQiOiJuYmNneSIsInV1aWQiOiJjYTY3MTZhNy1lZDJjLTQ4NDYtOGRiYy1kYzE2MjlkODQ5ZDQiLCJyZW1lbWJlck1lIjpmYWxzZSwiZXhwaXJhdGlvbkRhdGUiOjE3MDY5MzE1ODY5NTEsImluZm9NYXAiOm51bGwsImNhVG9rZW4iOm51bGwsInRlbmFudENvZGUiOm51bGwsInN1YiI6IjE2OTQ5NTQ5NTMyMTA5ODY0OTgiLCJpYXQiOjE3MDYzMjY3ODYsImV4cCI6MTcwNjkzMTU4Nn0.xhaf-ZAehEopBNTAGyG6Fm9ybYJX0xA-d-5jnd13DytKHQ7Mvdfmidfee4q5j6CMxZAJP-LilAQilc5yDLrWXA\"},\"message\":\"操作成功\",\"timestamp\":1706326787084}","requestUrl":"/api/auth/login","serverIp":"192.168.2.77"},{"appName":"jyzb-app","clientBrowser":"Chrome","clientIp":"192.168.3.40","clientOs":"Windows 10 or Windows Server 2016","createTime":1706326787169,"httpMethod":"GET","logContent":"查询所有字典项","logId":"4f38c386-0dae-4599-8b8b-7bc30b18e0a2","logName":"API接口日志记录","logType":10,"requestParams":"{}","requestResult":"{\"code\":99200,\"data\":[{\"dictId\":1694579766623940609,\"dictCode\":\"examine_state\",\"dictName\":\"审核状态\",\"itemList\":[{\"itemValue\":\"none\",\"itemText\":\"待提交\"},{\"itemValue\":\"working\",\"itemText\":\"审核中\"},{\"itemValue\":\"finished\",\"itemText\":\"已审核\"},{\"itemValue\":\"refuse\",\"itemText\":\"已驳回\"}]},{\"dictId\":1694580374319869953,\"dictCode\":\"manual_state\",\"dictName\":\"是否已记账\",\"itemList\":[{\"itemValue\":\"0\",\"itemText\":\"未记账\"},{\"itemValue\":\"1\",\"itemText\":\"已记账\"}]},{\"dictId\":1694585413692239874,\"dictCode\":\"bussiness_type\",\"dictName\":\"业务单据类型\",\"itemList\":[{\"itemValue\":\"purchase\",\"itemText\":\"采购入库\"},{\"itemValue\":\"allocate\",\"itemText\":\"调拨入库\"},{\"itemValue\":\"return\",\"itemText\":\"归还入库\"},{\"itemValue\":\"gift\",\"itemText\":\"赠予入库\"},{\"itemValue\":\"repair\",\"itemText\":\"维修入库\"},{\"itemValue\":\"other\",\"itemText\":\"其它入库\"}]},{\"dictId\":1694585759869120514,\"dictCode\":\"order_state\",\"dictName\":\"入库单据状态\",\"itemList\":[{\"itemValue\":\"ready\",\"itemText\":\"待入库\"},{\"itemValue\":\"finished\",\"itemText\":\"已入库\"},{\"itemValue\":\"working\",\"itemText\":\"入库中\"}]},{\"dictId\":1694898185181208578,\"dictCode\":\"sex\",\"dictName\":\"性别\",\"itemList\":[{\"itemValue\":\"M\",\"itemText\":\"男\"},{\"itemValue\":\"F\",\"itemText\":\"女\"}]},{\"dictId\":1694959896185667586,\"dictCode\":\"status_flag\",\"dictName\":\"用户状态\",\"itemList\":[{\"itemValue\":\"1\",\"itemText\":\"正常\"},{\"itemValue\":\"2\",\"itemText\":\"冻结\"}]},{\"dictId\":1698499517901385730,\"dictCode\":\"allocate_type\",\"dictName\":\"调拨类型\",\"itemList\":[{\"itemValue\":\"1\",\"itemText\":\"价拨\"},{\"itemValue\":\"2\",\"itemText\":\"支拨\"}]},{\"dictId\":1698968953234038786,\"dictCode\":\"message_type\",\"dictName\":\"消息通知类型\",\"itemList\":[{\"itemValue\":\"over_due\",\"itemText\":\"over_due\"},{\"itemValue\":\"expire\",\"itemText\":\"expire\"},{\"itemValue\":\"threshold\",\"itemText\":\"threshold\"}]},{\"dictId\":1702197892597338113,\"dictCode\":\"busstype_chinese\",\"dictName\":\"业务类型中文配置\",\"itemList\":[{\"itemValue\":\"CG\",\"itemText\":\"purchase\"},{\"itemValue\":\"DB\",\"itemText\":\"allocate\"},{\"itemValue\":\"GH\",\"itemText\":\"return\"},{\"itemValue\":\"ZY\",\"itemText\":\"gift\"},{\"itemValue\":\"QT\",\"itemText\":\"other\"},{\"itemValue\":\"PK\",\"itemText\":\"stocktake\"},{\"itemValue\":\"WX\",\"itemText\":\"repair\"},{\"itemValue\":\"BF\",\"itemText\":\"remove\"},{\"itemValue\":\"LY\",\"itemText\":\"use\"},{\"itemValue\":\"XH\",\"itemText\":\"destruction\"},{\"itemValue\":\"YK\",\"itemText\":\"quick\"},{\"itemValue\":\"DG\",\"itemText\":\"transfer\"},{\"itemValue\":\"PD\",\"itemText\":\"bussinessInventory\"}]},{\"dictId\":1704688676299169793,\"dictCode\":\"order_type\",\"dictName\":\"单据类型\",\"itemList\":[{\"itemValue\":\"in\",\"itemText\":\"入库\"},{\"itemValue\":\"out\",\"itemText\":\"出库\"}]},{\"dictId\":1705036035470213121,\"dictCode\":\"out_type\",\"dictName\":\"出库状态\",\"itemList\":[{\"itemValue\":\"use\",\"itemText\":\"领用出库\"},{\"itemValue\":\"allocate\",\"itemText\":\"调拨出库\"},{\"itemValue\":\"repair\",\"itemText\":\"维修出库\"},{\"itemValue\":\"destruction\",\"itemText\":\"销毁出库\"},{\"itemValue\":\"quick\",\"itemText\":\"快速移库\"},{\"itemValue\":\"other\",\"itemText\":\"其他出库\"}]},{\"dictId\":1706836743811043329,\"dictCode\":\"order_chinese_setting\",\"dictName\":\"出入库单据中文配置\",\"itemList\":[{\"itemValue\":\"RK\",\"itemText\":\"in\"},{\"itemValue\":\"CK\",\"itemText\":\"out\"}]},{\"dictId\":1706855601551167490,\"dictCode\":\"1704304136662556672\",\"dictName\":\"采购\",\"itemList\":[]},{\"dictId\":1706856025205231617,\"dictCode\":\"purchase\",\"dictName\":\"采购\",\"itemList\":[{\"itemValue\":\"1704304136662556672\",\"itemText\":\"purchase\"}]},{\"dictId\":1706860605269278722,\"dictCode\":\"work_process\",\"dictName\":\"业务单与流程\",\"itemList\":[{\"itemValue\":\"1704304136662556672\",\"itemText\":\"purchase\"},{\"itemValue\":\"1711601897963536384\",\"itemText\":\"allocate\"},{\"itemValue\":\"1711667538846314496\",\"itemText\":\"remove\"},{\"itemValue\":\"1712380910092963840\",\"itemText\":\"gift\"},{\"itemValue\":\"1712380233308459008\",\"itemText\":\"repair\"},{\"itemValue\":\"1712380789364117504\",\"itemText\":\"return\"},{\"itemValue\":\"1712380441517903872\",\"itemText\":\"use\"},{\"itemValue\":\"1712384069121101824\",\"itemText\":\"other\"},{\"itemValue\":\"1712384374781005824\",\"itemText\":\"check\"},{\"itemValue\":\"1722415267939700736\",\"itemText\":\"quick\"},{\"itemValue\":\"1722792849193316352\",\"itemText\":\"transfer\"},{\"itemValue\":\"1729404503624515584\",\"itemText\":\"destruction\"},{\"itemValue\":\"1730420393853882368\",\"itemText\":\"allocateDown\"},{\"itemValue\":\"1740569408830500864\",\"itemText\":\"purchase/1369509498032811869\"},{\"itemValue\":\"1750706537064980480\",\"itemText\":\"use/\"}]},{\"dictId\":1714810872312782849,\"dictCode\":\"brokenNumber\",\"dictName\":\"临近报废天数\",\"itemList\":[{\"itemValue\":\"15\",\"itemText\":\"brokenNumber\"}]},{\"dictId\":1719533958430031873,\"dictCode\":\"buiness_form\",\"dictName\":\"业务单动态表单\",\"itemList\":[{\"itemValue\":\"[{\\\"field\\\":\\\"divider-basic\\\",\\\"component\\\":\\\"Divider\\\",\\\"label\\\":\\\"申请领用单\\\",\\\"componentProps\\\":{\\\"orientation\\\":\\\"center\\\"},\\\"colProps\\\":{\\\"span\\\":24}},{\\\"label\\\":\\\"经办人\\\",\\\"field\\\":\\\"agent\\\",\\\"component\\\":\\\"Input\\\"},{\\\"label\\\":\\\"领用人\\\",\\\"field\\\":\\\"returnUser\\\",\\\"component\\\":\\\"Input\\\"},{\\\"field\\\":\\\"applyTime\\\",\\\"label\\\":\\\"申请时间\\\",\\\"component\\\":\\\"DatePicker\\\",\\\"componentProps\\\":{\\\"valueFormat\\\":\\\"YYYY-MM-DD HH:mm\\\",\\\"format\\\":\\\"YYYY-MM-DD HH:mm\\\",\\\"style\\\":\\\"width: 100%\\\"}},{\\\"field\\\":\\\"returnData\\\",\\\"label\\\":\\\"归还时间\\\",\\\"component\\\":\\\"DatePicker\\\",\\\"helpMessage\\\":\\\"归还时间不填写则为长期领用\\\",\\\"componentProps\\\":{\\\"placeholder\\\":\\\"\\\",\\\"valueFormat\\\":\\\"YYYY-MM-DD\\\",\\\"format\\\":\\\"YYYY-MM-DD\\\",\\\"style\\\":\\\"width: 100%\\\"}},{\\\"field\\\":\\\"note\\\",\\\"label\\\":\\\"备注\\\",\\\"component\\\":\\\"InputTextArea\\\",\\\"colProps\\\":{\\\"span\\\":24}}]\",\"itemText\":\"use\"},{\"itemValue\":\"[{\\\"field\\\":\\\"divider-basic\\\",\\\"component\\\":\\\"Divider\\\",\\\"label\\\":\\\"申请采购单\\\",\\\"componentProps\\\":{\\\"orientation\\\":\\\"center\\\"},\\\"colProps\\\":{\\\"span\\\":24}},{\\\"label\\\":\\\"经办人\\\",\\\"field\\\":\\\"agent\\\",\\\"component\\\":\\\"Input\\\"},{\\\"field\\\":\\\"applyTime\\\",\\\"label\\\":\\\"申请时间\\\",\\\"component\\\":\\\"DatePicker\\\",\\\"componentProps\\\":{\\\"valueFormat\\\":\\\"YYYY-MM-DD HH:mm\\\",\\\"format\\\":\\\"YYYY-MM-DD HH:mm\\\",\\\"style\\\":\\\"width: 100%\\\"}},{\\\"field\\\":\\\"supplierName\\\",\\\"label\\\":\\\"供应商\\\",\\\"component\\\":\\\"Input\\\"},{\\\"field\\\":\\\"note\\\",\\\"label\\\":\\\"备注\\\",\\\"component\\\":\\\"InputTextArea\\\",\\\"colProps\\\":{\\\"span\\\":24}}]\",\"itemText\":\"purchase\"},{\"itemValue\":\"[{\\\"field\\\":\\\"divider-basic\\\",\\\"component\\\":\\\"Divider\\\",\\\"label\\\":\\\"申请调拨单\\\",\\\"componentProps\\\":{\\\"orientation\\\":\\\"center\\\"},\\\"colProps\\\":{\\\"span\\\":24}},{\\\"label\\\":\\\"经办人\\\",\\\"field\\\":\\\"agent\\\",\\\"component\\\":\\\"Input\\\"},{\\\"label\\\":\\\"调拨类型\\\",\\\"field\\\":\\\"allocateType\\\",\\\"component\\\":\\\"JDictSelectTag\\\",\\\"componentProps\\\":{\\\"dictCode\\\":\\\"allocate_type\\\"}},{\\\"field\\\":\\\"applyTime\\\",\\\"label\\\":\\\"申请时间\\\",\\\"component\\\":\\\"DatePicker\\\",\\\"componentProps\\\":{\\\"valueFormat\\\":\\\"YYYY-MM-DD HH:mm\\\",\\\"format\\\":\\\"YYYY-MM-DD HH:mm\\\",\\\"style\\\":\\\"width: 100%\\\"}},{\\\"field\\\":\\\"startOrgName\\\",\\\"label\\\":\\\"发物单位\\\",\\\"component\\\":\\\"Input\\\"},{\\\"field\\\":\\\"endOrgName\\\",\\\"label\\\":\\\"收物单位\\\",\\\"component\\\":\\\"Input\\\"},{\\\"field\\\":\\\"note\\\",\\\"label\\\":\\\"备注\\\",\\\"component\\\":\\\"InputTextArea\\\",\\\"colProps\\\":{\\\"span\\\":24}}]\",\"itemText\":\"allocate\"},{\"itemValue\":\"[{\\\"field\\\":\\\"divider-basic\\\",\\\"component\\\":\\\"Divider\\\",\\\"label\\\":\\\"申请维修单\\\",\\\"componentProps\\\":{\\\"orientation\\\":\\\"center\\\"},\\\"colProps\\\":{\\\"span\\\":24}},{\\\"label\\\":\\\"经办人\\\",\\\"field\\\":\\\"agent\\\",\\\"component\\\":\\\"Input\\\"},{\\\"field\\\":\\\"applyTime\\\",\\\"label\\\":\\\"申请时间\\\",\\\"component\\\":\\\"DatePicker\\\",\\\"componentProps\\\":{\\\"valueFormat\\\":\\\"YYYY-MM-DD HH:mm\\\",\\\"format\\\":\\\"YYYY-MM-DD HH:mm\\\",\\\"style\\\":\\\"width: 100%\\\"}},{\\\"field\\\":\\\"supplierName\\\",\\\"label\\\":\\\"维修单位\\\",\\\"component\\\":\\\"Input\\\"},{\\\"field\\\":\\\"note\\\",\\\"label\\\":\\\"备注\\\",\\\"component\\\":\\\"InputTextArea\\\",\\\"colProps\\\":{\\\"span\\\":24}}]\",\"itemText\":\"repair\"},{\"itemValue\":\"[{\\\"field\\\":\\\"divider-basic\\\",\\\"component\\\":\\\"Divider\\\",\\\"label\\\":\\\"申请销毁单\\\",\\\"componentProps\\\":{\\\"orientation\\\":\\\"center\\\"},\\\"colProps\\\":{\\\"span\\\":24}},{\\\"label\\\":\\\"经办人\\\",\\\"field\\\":\\\"agent\\\",\\\"component\\\":\\\"Input\\\"},{\\\"field\\\":\\\"applyTime\\\",\\\"label\\\":\\\"申请时间\\\",\\\"component\\\":\\\"DatePicker\\\",\\\"componentProps\\\":{\\\"valueFormat\\\":\\\"YYYY-MM-DD HH:mm\\\",\\\"format\\\":\\\"YYYY-MM-DD HH:mm\\\",\\\"style\\\":\\\"width: 100%\\\"}},{\\\"field\\\":\\\"supplierName\\\",\\\"label\\\":\\\"销毁单位\\\",\\\"component\\\":\\\"Input\\\"},{\\\"field\\\":\\\"note\\\",\\\"label\\\":\\\"备注\\\",\\\"component\\\":\\\"InputTextArea\\\",\\\"colProps\\\":{\\\"span\\\":24}}]\",\"itemText\":\"destruction\"},{\"itemValue\":\"[{\\\"field\\\":\\\"divider-basic\\\",\\\"component\\\":\\\"Divider\\\",\\\"label\\\":\\\"申请报废单\\\",\\\"componentProps\\\":{\\\"orientation\\\":\\\"center\\\"},\\\"colProps\\\":{\\\"span\\\":24}},{\\\"label\\\":\\\"经办人\\\",\\\"field\\\":\\\"agent\\\",\\\"component\\\":\\\"Input\\\"},{\\\"field\\\":\\\"applyTime\\\",\\\"label\\\":\\\"申请时间\\\",\\\"component\\\":\\\"DatePicker\\\",\\\"componentProps\\\":{\\\"valueFormat\\\":\\\"YYYY-MM-DD HH:mm\\\",\\\"format\\\":\\\"YYYY-MM-DD HH:mm\\\",\\\"style\\\":\\\"width: 100%\\\"}},{\\\"field\\\":\\\"type\\\",\\\"component\\\":\\\"Select\\\",\\\"label\\\":\\\"报废类型\\\",\\\"componentProps\\\":{\\\"options\\\":[{\\\"label\\\":\\\"报废出库\\\",\\\"value\\\":\\\"1\\\",\\\"key\\\":\\\"1\\\"},{\\\"label\\\":\\\"移入报废区\\\",\\\"value\\\":\\\"2\\\",\\\"key\\\":\\\"2\\\"}]}},{\\\"field\\\":\\\"note\\\",\\\"label\\\":\\\"备注\\\",\\\"component\\\":\\\"InputTextArea\\\",\\\"colProps\\\":{\\\"span\\\":24}}]\",\"itemText\":\"remove\"}]},{\"dictId\":1719907664272642049,\"dictCode\":\"out_state\",\"dictName\":\"出库单据状态\",\"itemList\":[{\"itemValue\":\"ready\",\"itemText\":\"待出库\"},{\"itemValue\":\"finished\",\"itemText\":\"已出库\"},{\"itemValue\":\"working\",\"itemText\":\"出库中\"}]},{\"dictId\":1721387962764103681,\"dictCode\":\"outStorage_form\",\"dictName\":\"出库单动态表单\",\"itemList\":[{\"itemValue\":\"[{\\\"field\\\":\\\"divider-basic\\\",\\\"component\\\":\\\"Divider\\\",\\\"label\\\":\\\"领用出库单\\\",\\\"componentProps\\\":{\\\"orientation\\\":\\\"center\\\"},\\\"colProps\\\":{\\\"span\\\":24}},{\\\"field\\\":\\\"returnUser\\\",\\\"component\\\":\\\"Input\\\",\\\"label\\\":\\\"领用人\\\"},{\\\"label\\\":\\\"经办人\\\",\\\"field\\\":\\\"startOrgUserName\\\",\\\"component\\\":\\\"Input\\\"},{\\\"field\\\":\\\"useDate\\\",\\\"label\\\":\\\"申请时间\\\",\\\"component\\\":\\\"DatePicker\\\",\\\"componentProps\\\":{\\\"valueFormat\\\":\\\"YYYY-MM-DD HH:mm\\\",\\\"format\\\":\\\"YYYY-MM-DD HH:mm\\\",\\\"style\\\":\\\"width: 100%\\\"}},{\\\"field\\\":\\\"returnData\\\",\\\"label\\\":\\\"归还时间\\\",\\\"component\\\":\\\"DatePicker\\\",\\\"helpMessage\\\":\\\"归还时间不填写则为长期领用\\\",\\\"componentProps\\\":{\\\"placeholder\\\":\\\"\\\",\\\"valueFormat\\\":\\\"YYYY-MM-DD\\\",\\\"format\\\":\\\"YYYY-MM-DD\\\",\\\"style\\\":\\\"width: 100%\\\"}},{\\\"field\\\":\\\"note\\\",\\\"label\\\":\\\"备注\\\",\\\"component\\\":\\\"InputTextArea\\\",\\\"colProps\\\":{\\\"span\\\":24}}]\",\"itemText\":\"use\"},{\"itemValue\":\"[{\\\"field\\\":\\\"divider-basic\\\",\\\"component\\\":\\\"Divider\\\",\\\"label\\\":\\\"调拨出库单\\\",\\\"componentProps\\\":{\\\"orientation\\\":\\\"center\\\"},\\\"colProps\\\":{\\\"span\\\":24}},{\\\"label\\\":\\\"经办人\\\",\\\"field\\\":\\\"startOrgUserName\\\",\\\"component\\\":\\\"Input\\\"},{\\\"field\\\":\\\"useDate\\\",\\\"label\\\":\\\"申请时间\\\",\\\"component\\\":\\\"DatePicker\\\",\\\"componentProps\\\":{\\\"valueFormat\\\":\\\"YYYY-MM-DD HH:mm\\\",\\\"format\\\":\\\"YYYY-MM-DD HH:mm\\\",\\\"style\\\":\\\"width: 100%\\\"}},{\\\"label\\\":\\\"调拨类型\\\",\\\"field\\\":\\\"allocateType\\\",\\\"component\\\":\\\"JDictSelectTag\\\",\\\"componentProps\\\":{\\\"dictCode\\\":\\\"allocate_type\\\"}},{\\\"field\\\":\\\"startOrgName\\\",\\\"label\\\":\\\"发物单位\\\",\\\"component\\\":\\\"Input\\\"},{\\\"field\\\":\\\"endOrgName\\\",\\\"label\\\":\\\"收物单位\\\",\\\"component\\\":\\\"Input\\\"},{\\\"field\\\":\\\"note\\\",\\\"label\\\":\\\"备注\\\",\\\"component\\\":\\\"InputTextArea\\\",\\\"colProps\\\":{\\\"span\\\":24}}]\",\"itemText\":\"allocate\"},{\"itemValue\":\"[{\\\"field\\\":\\\"divider-basic\\\",\\\"component\\\":\\\"Divider\\\",\\\"label\\\":\\\"维修出库单\\\",\\\"componentProps\\\":{\\\"orientation\\\":\\\"center\\\"},\\\"colProps\\\":{\\\"span\\\":24}},{\\\"label\\\":\\\"经办人\\\",\\\"field\\\":\\\"startOrgUserName\\\",\\\"component\\\":\\\"Input\\\"},{\\\"label\\\":\\\"维修单位\\\",\\\"field\\\":\\\"supplierName\\\",\\\"component\\\":\\\"Input\\\",\\\"componentProps\\\":{\\\"placeholder\\\":\\\"\\\"}},{\\\"field\\\":\\\"useDate\\\",\\\"label\\\":\\\"申请时间\\\",\\\"component\\\":\\\"DatePicker\\\",\\\"componentProps\\\":{\\\"valueFormat\\\":\\\"YYYY-MM-DD\\\",\\\"format\\\":\\\"YYYY-MM-DD\\\",\\\"style\\\":\\\"width: 100%\\\"}},{\\\"field\\\":\\\"note\\\",\\\"label\\\":\\\"备注\\\",\\\"component\\\":\\\"InputTextArea\\\",\\\"colProps\\\":{\\\"span\\\":24}}]\",\"itemText\":\"repair\"},{\"itemValue\":\"[{\\\"field\\\":\\\"divider-basic\\\",\\\"component\\\":\\\"Divider\\\",\\\"label\\\":\\\"报废出库单\\\",\\\"componentProps\\\":{\\\"orientation\\\":\\\"center\\\"},\\\"colProps\\\":{\\\"span\\\":24}},{\\\"label\\\":\\\"经办人\\\",\\\"field\\\":\\\"startOrgUserName\\\",\\\"component\\\":\\\"Input\\\"},{\\\"label\\\":\\\"报废单位\\\",\\\"field\\\":\\\"destoryName\\\",\\\"component\\\":\\\"Input\\\",\\\"componentProps\\\":{\\\"placeholder\\\":\\\"\\\"}},{\\\"field\\\":\\\"useDate\\\",\\\"label\\\":\\\"申请时间\\\",\\\"component\\\":\\\"DatePicker\\\",\\\"componentProps\\\":{\\\"valueFormat\\\":\\\"YYYY-MM-DD\\\",\\\"format\\\":\\\"YYYY-MM-DD\\\",\\\"style\\\":\\\"width: 100%\\\"}},{\\\"field\\\":\\\"note\\\",\\\"label\\\":\\\"备注\\\",\\\"component\\\":\\\"InputTextArea\\\",\\\"colProps\\\":{\\\"span\\\":24}}]\",\"itemText\":\"remove\"},{\"itemValue\":\"[{\\\"field\\\":\\\"divider-basic\\\",\\\"component\\\":\\\"Divider\\\",\\\"label\\\":\\\"销毁出库单\\\",\\\"componentProps\\\":{\\\"orientation\\\":\\\"center\\\"},\\\"colProps\\\":{\\\"span\\\":24}},{\\\"label\\\":\\\"经办人\\\",\\\"field\\\":\\\"startOrgUserName\\\",\\\"component\\\":\\\"Input\\\"},{\\\"label\\\":\\\"销毁单位\\\",\\\"field\\\":\\\"supplierName\\\",\\\"component\\\":\\\"Input\\\",\\\"componentProps\\\":{\\\"placeholder\\\":\\\"\\\"}},{\\\"field\\\":\\\"useDate\\\",\\\"label\\\":\\\"申请时间\\\",\\\"component\\\":\\\"DatePicker\\\",\\\"componentProps\\\":{\\\"valueFormat\\\":\\\"YYYY-MM-DD\\\",\\\"format\\\":\\\"YYYY-MM-DD\\\",\\\"style\\\":\\\"width: 100%\\\"}},{\\\"field\\\":\\\"note\\\",\\\"label\\\":\\\"备注\\\",\\\"component\\\":\\\"InputTextArea\\\",\\\"colProps\\\":{\\\"span\\\":24}}]\",\"itemText\":\"destruction\"},{\"itemValue\":\"[{\\\"field\\\":\\\"divider-basic\\\",\\\"component\\\":\\\"Divider\\\",\\\"label\\\":\\\"快速移库单\\\",\\\"componentProps\\\":{\\\"orientation\\\":\\\"center\\\"},\\\"colProps\\\":{\\\"span\\\":24}},{\\\"label\\\":\\\"经办人\\\",\\\"field\\\":\\\"startOrgUserName\\\",\\\"component\\\":\\\"Input\\\"},{\\\"label\\\":\\\"目标仓库\\\",\\\"field\\\":\\\"locationName\\\",\\\"component\\\":\\\"Input\\\",\\\"componentProps\\\":{\\\"placeholder\\\":\\\"\\\"}},{\\\"field\\\":\\\"useDate\\\",\\\"label\\\":\\\"申请时间\\\",\\\"component\\\":\\\"DatePicker\\\",\\\"componentProps\\\":{\\\"valueFormat\\\":\\\"YYYY-MM-DD\\\",\\\"format\\\":\\\"YYYY-MM-DD\\\",\\\"style\\\":\\\"width: 100%\\\"}},{\\\"field\\\":\\\"note\\\",\\\"label\\\":\\\"备注\\\",\\\"component\\\":\\\"InputTextArea\\\",\\\"colProps\\\":{\\\"span\\\":24}}]\",\"itemText\":\"quick\"}]},{\"dictId\":1721439629131943938,\"dictCode\":\"inStorage_form\",\"dictName\":\"入库单动态表单\",\"itemList\":[{\"itemValue\":\"[{\\\"field\\\":\\\"divider-basic\\\",\\\"component\\\":\\\"Divider\\\",\\\"label\\\":\\\"采购入库单\\\",\\\"componentProps\\\":{\\\"orientation\\\":\\\"center\\\"},\\\"colProps\\\":{\\\"span\\\":24}},{\\\"label\\\":\\\"经办人\\\",\\\"field\\\":\\\"endOrgUserName\\\",\\\"component\\\":\\\"Input\\\"},{\\\"field\\\":\\\"useDate\\\",\\\"label\\\":\\\"申请时间\\\",\\\"component\\\":\\\"DatePicker\\\",\\\"componentProps\\\":{\\\"valueFormat\\\":\\\"YYYY-MM-DD \\\",\\\"format\\\":\\\"YYYY-MM-DD \\\",\\\"style\\\":\\\"width: 100%\\\"}},{\\\"label\\\":\\\"发物单位\\\",\\\"field\\\":\\\"supplierName\\\",\\\"component\\\":\\\"Input\\\",\\\"componentProps\\\":{\\\"placeholder\\\":\\\"\\\"}},{\\\"field\\\":\\\"note\\\",\\\"label\\\":\\\"备注\\\",\\\"component\\\":\\\"InputTextArea\\\",\\\"colProps\\\":{\\\"span\\\":24}}]\",\"itemText\":\"purchase\"},{\"itemValue\":\"[{\\\"field\\\":\\\"divider-basic\\\",\\\"component\\\":\\\"Divider\\\",\\\"label\\\":\\\"调拨入库单\\\",\\\"componentProps\\\":{\\\"orientation\\\":\\\"center\\\"},\\\"colProps\\\":{\\\"span\\\":24}},{\\\"label\\\":\\\"经办人\\\",\\\"field\\\":\\\"endOrgUserName\\\",\\\"component\\\":\\\"Input\\\"},{\\\"field\\\":\\\"useDate\\\",\\\"label\\\":\\\"申请时间\\\",\\\"component\\\":\\\"DatePicker\\\",\\\"componentProps\\\":{\\\"valueFormat\\\":\\\"YYYY-MM-DD\\\",\\\"format\\\":\\\"YYYY-MM-DD\\\",\\\"style\\\":\\\"width: 100%\\\"}},{\\\"label\\\":\\\"调拨类型\\\",\\\"field\\\":\\\"allocateType\\\",\\\"component\\\":\\\"JDictSelectTag\\\",\\\"componentProps\\\":{\\\"dictCode\\\":\\\"allocate_type\\\",\\\"placeholder\\\":\\\"\\\"}},{\\\"label\\\":\\\"发物单位\\\",\\\"field\\\":\\\"startOrgName\\\",\\\"component\\\":\\\"Input\\\",\\\"componentProps\\\":{\\\"placeholder\\\":\\\"\\\"}},{\\\"field\\\":\\\"endOrgName\\\",\\\"label\\\":\\\"收物单位\\\",\\\"component\\\":\\\"Input\\\",\\\"componentProps\\\":{\\\"placeholder\\\":\\\"\\\"}},{\\\"field\\\":\\\"note\\\",\\\"label\\\":\\\"备注\\\",\\\"component\\\":\\\"InputTextArea\\\",\\\"colProps\\\":{\\\"span\\\":24}}]\",\"itemText\":\"allocate\"},{\"itemValue\":\"[{\\\"field\\\":\\\"divider-basic\\\",\\\"component\\\":\\\"Divider\\\",\\\"label\\\":\\\"归还入库单\\\",\\\"componentProps\\\":{\\\"orientation\\\":\\\"center\\\"},\\\"colProps\\\":{\\\"span\\\":24}},{\\\"label\\\":\\\"经办人\\\",\\\"field\\\":\\\"endOrgUserName\\\",\\\"component\\\":\\\"Input\\\"},{\\\"label\\\":\\\"归还人\\\",\\\"field\\\":\\\"returnUser\\\",\\\"component\\\":\\\"Input\\\"},{\\\"field\\\":\\\"useDate\\\",\\\"label\\\":\\\"申请时间\\\",\\\"component\\\":\\\"DatePicker\\\",\\\"componentProps\\\":{\\\"valueFormat\\\":\\\"YYYY-MM-DD\\\",\\\"format\\\":\\\"YYYY-MM-DD\\\",\\\"style\\\":\\\"width: 100%\\\"}},{\\\"field\\\":\\\"note\\\",\\\"label\\\":\\\"备注\\\",\\\"component\\\":\\\"InputTextArea\\\",\\\"colProps\\\":{\\\"span\\\":24}}]\",\"itemText\":\"return\"},{\"itemValue\":\"[{\\\"field\\\":\\\"divider-basic\\\",\\\"component\\\":\\\"Divider\\\",\\\"label\\\":\\\"赠予入库单\\\",\\\"componentProps\\\":{\\\"orientation\\\":\\\"center\\\"},\\\"colProps\\\":{\\\"span\\\":24}},{\\\"label\\\":\\\"经办人\\\",\\\"field\\\":\\\"endOrgUserName\\\",\\\"component\\\":\\\"Input\\\"},{\\\"label\\\":\\\"生产厂商\\\",\\\"field\\\":\\\"manufacturerName\\\",\\\"component\\\":\\\"Input\\\",\\\"componentProps\\\":{\\\"placeholder\\\":\\\"\\\"}},{\\\"field\\\":\\\"useDate\\\",\\\"label\\\":\\\"申请时间\\\",\\\"component\\\":\\\"DatePicker\\\",\\\"componentProps\\\":{\\\"valueFormat\\\":\\\"YYYY-MM-DD\\\",\\\"format\\\":\\\"YYYY-MM-DD\\\",\\\"style\\\":\\\"width: 100%\\\"}},{\\\"field\\\":\\\"note\\\",\\\"label\\\":\\\"备注\\\",\\\"component\\\":\\\"InputTextArea\\\",\\\"colProps\\\":{\\\"span\\\":24}}]\",\"itemText\":\"gift\"},{\"itemValue\":\"[{\\\"field\\\":\\\"divider-basic\\\",\\\"component\\\":\\\"Divider\\\",\\\"label\\\":\\\"其他入库单\\\",\\\"componentProps\\\":{\\\"orientation\\\":\\\"center\\\"},\\\"colProps\\\":{\\\"span\\\":24}},{\\\"label\\\":\\\"经办人\\\",\\\"field\\\":\\\"endOrgUserName\\\",\\\"component\\\":\\\"Input\\\"},{\\\"label\\\":\\\"生产厂商\\\",\\\"field\\\":\\\"manufacturerName\\\",\\\"component\\\":\\\"Input\\\",\\\"componentProps\\\":{\\\"placeholder\\\":\\\"\\\"}},{\\\"field\\\":\\\"useDate\\\",\\\"label\\\":\\\"申请时间\\\",\\\"component\\\":\\\"DatePicker\\\",\\\"componentProps\\\":{\\\"valueFormat\\\":\\\"YYYY-MM-DD\\\",\\\"format\\\":\\\"YYYY-MM-DD\\\",\\\"style\\\":\\\"width: 100%\\\"}},{\\\"field\\\":\\\"note\\\",\\\"label\\\":\\\"备注\\\",\\\"component\\\":\\\"InputTextArea\\\",\\\"colProps\\\":{\\\"span\\\":24}}]\",\"itemText\":\"other\"},{\"itemValue\":\"[{\\\"field\\\":\\\"divider-basic\\\",\\\"component\\\":\\\"Divider\\\",\\\"label\\\":\\\"维修入库单\\\",\\\"componentProps\\\":{\\\"orientation\\\":\\\"center\\\"},\\\"colProps\\\":{\\\"span\\\":24}},{\\\"label\\\":\\\"经办人\\\",\\\"field\\\":\\\"endOrgUserName\\\",\\\"component\\\":\\\"Input\\\"},{\\\"field\\\":\\\"useDate\\\",\\\"label\\\":\\\"申请时间\\\",\\\"component\\\":\\\"DatePicker\\\",\\\"componentProps\\\":{\\\"valueFormat\\\":\\\"YYYY-MM-DD \\\",\\\"format\\\":\\\"YYYY-MM-DD \\\",\\\"style\\\":\\\"width: 100%\\\"}},{\\\"label\\\":\\\"发物单位\\\",\\\"field\\\":\\\"supplierName\\\",\\\"component\\\":\\\"Input\\\",\\\"componentProps\\\":{\\\"placeholder\\\":\\\"\\\"}},{\\\"field\\\":\\\"note\\\",\\\"label\\\":\\\"备注\\\",\\\"component\\\":\\\"InputTextArea\\\",\\\"colProps\\\":{\\\"span\\\":24}}]\",\"itemText\":\"repair\"}]},{\"dictId\":1729327653928882177,\"dictCode\":\"reassignment_type\",\"dictName\":\"调岗类型\",\"itemList\":[{\"itemValue\":\"assign\",\"itemText\":\"调入警员\"},{\"itemValue\":\"reassign\",\"itemText\":\"调出警员\"}]},{\"dictId\":1729391778407186433,\"dictCode\":\"reassignment_form\",\"dictName\":\"调岗动态表单\",\"itemList\":[{\"itemValue\":\"[{\\\"field\\\":\\\"divider-basic\\\",\\\"component\\\":\\\"Divider\\\",\\\"label\\\":\\\"警员调岗单\\\",\\\"componentProps\\\":{\\\"orientation\\\":\\\"center\\\"},\\\"colProps\\\":{\\\"span\\\":24}},{\\\"label\\\":\\\"经办人\\\",\\\"field\\\":\\\"agent\\\",\\\"component\\\":\\\"Input\\\"},{\\\"label\\\":\\\"调岗类型\\\",\\\"field\\\":\\\"reassignmentType\\\",\\\"component\\\":\\\"JDictSelectTag\\\",\\\"componentProps\\\":{\\\"dictCode\\\":\\\"reassignment_type\\\"}},{\\\"label\\\":\\\"调岗警员\\\",\\\"field\\\":\\\"policeName\\\",\\\"component\\\":\\\"Input\\\"},{\\\"field\\\":\\\"applyTime\\\",\\\"label\\\":\\\"申请时间\\\",\\\"component\\\":\\\"DatePicker\\\",\\\"componentProps\\\":{\\\"valueFormat\\\":\\\"YYYY-MM-DD HH:mm\\\",\\\"format\\\":\\\"YYYY-MM-DD HH:mm\\\",\\\"style\\\":\\\"width: 100%\\\"}},{\\\"field\\\":\\\"note\\\",\\\"label\\\":\\\"备注\\\",\\\"component\\\":\\\"InputTextArea\\\",\\\"colProps\\\":{\\\"span\\\":24}}]\",\"itemText\":\"transfer\"}]},{\"dictId\":1735520976695644162,\"dictCode\":\"out_process\",\"dictName\":\"出库单与流程\",\"itemList\":[{\"itemValue\":\"1722415267939700736\",\"itemText\":\"quick\"},{\"itemValue\":\"1735522446519427072\",\"itemText\":\"other\"},{\"itemValue\":\"1735522365430947840\",\"itemText\":\"destruction\"},{\"itemValue\":\"1735521936043270144\",\"itemText\":\"use\"},{\"itemValue\":\"1735521974098190336\",\"itemText\":\"allocate\"},{\"itemValue\":\"1735521996139257856\",\"itemText\":\"repair\"}]},{\"dictId\":1735525402579750913,\"dictCode\":\"in_process\",\"dictName\":\"入库单与流程\",\"itemList\":[{\"itemValue\":\"1712380910092963840\",\"itemText\":\"gift\"},{\"itemValue\":\"1712380789364117504\",\"itemText\":\"return\"},{\"itemValue\":\"1735524882759831552\",\"itemText\":\"repair\"},{\"itemValue\":\"1735526446933233664\",\"itemText\":\"purchase\"},{\"itemValue\":\"1735526635081322496\",\"itemText\":\"allocate\"},{\"itemValue\":\"1735526828828807168\",\"itemText\":\"other\"}]},{\"dictId\":1736610587249397762,\"dictCode\":\"device_type\",\"dictName\":\"出入库设备类型\",\"itemList\":[{\"itemValue\":\"0\",\"itemText\":\"手持机\"},{\"itemValue\":\"2\",\"itemText\":\"通道\"},{\"itemValue\":\"3\",\"itemText\":\"仓库主机\"}]},{\"dictId\":1737657301137768450,\"dictCode\":\"remove_note\",\"dictName\":\"销毁报废注解维护\",\"itemList\":[{\"itemValue\":\"注：业务类型为报废\",\"itemText\":\"remove\"},{\"itemValue\":\"注：业务类型为销毁\",\"itemText\":\"destruction\"}]},{\"dictId\":1738026533507710977,\"dictCode\":\"buiness_sort\",\"dictName\":\"业务单业务排序\",\"itemList\":[{\"itemValue\":\"[\\\"采购\\\",\\\"领用\\\",\\\"维修\\\",\\\"调拨\\\",\\\"报废销毁\\\",\\\"警员调岗\\\"]\",\"itemText\":\"浙江省宁波市公安局（示例）\"}]},{\"dictId\":1739095962572193793,\"dictCode\":\"time_default\",\"dictName\":\"开始时间默认配置\",\"itemList\":[{\"itemValue\":\"-30\",\"itemText\":\"startTime\"}]}],\"message\":\"操作成功\",\"timestamp\":1706326787169}","requestUrl":"/v1/pub/getAllDictItem","serverIp":"192.168.2.77","userId":1694954953210986498},{"appName":"jyzb-app","clientBrowser":"Chrome","clientIp":"192.168.3.40","clientOs":"Windows 10 or Windows Server 2016","createTime":1706326787189,"httpMethod":"GET","logContent":"获取系统所有菜单（适用于登录后获取左侧菜单","logId":"f543a738-b7d0-4f55-9384-89c103d2216d","logName":"API接口日志记录","logType":10,"requestParams":"{\"req\":{}}","requestResult":"{\"code\":99200,\"data\":[{\"title\":\"10003\",\"path\":\"/10003\",\"hide\":false,\"children\":[{\"icon\":\"ant-design:home-outlined\",\"title\":\"首页\",\"path\":\"/dashboard\",\"component\":\"dashboard/index\",\"hide\":false,\"menuCode\":\"dashboard\"},{\"icon\":\"ant-design:check-square-outlined\",\"title\":\"我的事务\",\"path\":\"/task\",\"component\":\"/task/index\",\"hide\":false,\"menuCode\":\"task\"},{\"icon\":\"ant-design:export-outlined\",\"title\":\"出库管理\",\"path\":\"/inWarehouse\",\"component\":\"/outStorage/index\",\"hide\":false,\"menuCode\":\"inWarehouse\"},{\"icon\":\"ant-design:import-outlined\",\"title\":\"入库管理\",\"path\":\"/inStorage/purchase\",\"component\":\"inStorage/index\",\"hide\":false,\"menuCode\":\"purchase\"},{\"icon\":\"ant-design:account-book-outlined\",\"title\":\"业务管理\",\"path\":\"/business\",\"component\":\"/business/index\",\"hide\":false,\"menuCode\":\"demodemo\"},{\"icon\":\"ant-design:user-outlined\",\"title\":\"人员管理\",\"path\":\"/system/policeman\",\"component\":\"sys/policeman/index\",\"hide\":false,\"menuCode\":\"policeman\"},{\"icon\":\"ant-design:database-outlined\",\"title\":\"库存管理\",\"path\":\"/inventory\",\"component\":\"layout\",\"hide\":false,\"children\":[{\"icon\":\"ant-design:align-center-outlined\",\"title\":\"库存管理\",\"path\":\"/inventory/inventorySummary\",\"component\":\"/inventorys/inventorySummary/index\",\"hide\":false,\"menuCode\":\"inventorySummary\"},{\"icon\":\"ant-design:book-outlined\",\"title\":\"出入库记录\",\"path\":\"/inventory/records\",\"component\":\"inventorys/records/index\",\"hide\":false,\"menuCode\":\"records\"},{\"icon\":\"ant-design:account-book-outlined\",\"title\":\"盘点管理\",\"path\":\"/inventorys/checkEquip\",\"component\":\"inventorys/checkEquip/index\",\"hide\":false,\"menuCode\":\"checkEquip\"}],\"menuCode\":\"inventory\"},{\"icon\":\"ant-design:desktop-outlined\",\"title\":\"数据报表\",\"path\":\"/report\",\"component\":\"layout\",\"hide\":false,\"children\":[{\"icon\":\"tabler:tools\",\"title\":\"装备统计报表\",\"path\":\"/report/equipReport\",\"component\":\"reports/equipReport/index\",\"hide\":false,\"menuCode\":\"equipReport\"},{\"icon\":\"tabler:device-imac-dollar\",\"title\":\"财务统计报表\",\"path\":\"/report/financeReport\",\"component\":\"reports/financeReport/index\",\"hide\":false,\"menuCode\":\"financeReport\"},{\"icon\":\"tabler:report\",\"title\":\"使用统计报表\",\"path\":\"/report/useReport\",\"component\":\"reports/useReport/index\",\"hide\":false,\"menuCode\":\"useReport\"},{\"icon\":\"tabler:user-check\",\"title\":\"人员统计报表\",\"path\":\"/report/policeReport\",\"component\":\"reports/policeReport/index\",\"hide\":false,\"menuCode\":\"policeReport\"},{\"icon\":\"tabler:gas-station\",\"title\":\"温湿度记录\",\"path\":\"/report/temperatureReport\",\"component\":\"reports/temperatureReport/index\",\"hide\":false,\"menuCode\":\"temperatureReport\"}],\"menuCode\":\"report\"}]}],\"message\":\"操作成功\",\"timestamp\":1706326787189}","requestUrl":"/sysMenu/getLeftMenus","serverIp":"192.168.2.77","userId":1694954953210986498}]
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrderDetailDto.java
...@@ -78,7 +78,5 @@ public class OrderDetailDto implements Serializable { ...@@ -78,7 +78,5 @@ public class OrderDetailDto implements Serializable {
//Epc类型（0固定资产1库存物资非固定资产） //Epc类型（0固定资产1库存物资非固定资产）
private Integer property; private Integer property;
//计划子单json
private String eqsJson;
} }
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrderDto.java
...@@ -129,5 +129,7 @@ public class OrderDto implements Serializable { ...@@ -129,5 +129,7 @@ public class OrderDto implements Serializable {
private String removeLocationName; private String removeLocationName;
private String note; private String note;
//计划子单json
private String eqsJson;
} }
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrderMainDto.java
...@@ -113,5 +113,8 @@ public class OrderMainDto implements Serializable { ...@@ -113,5 +113,8 @@ public class OrderMainDto implements Serializable {
*/ */
private String removeLocationName; private String removeLocationName;
//计划子单json
private String eqsJson;
} }
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/OrderDetailReq.java
...@@ -85,6 +85,5 @@ public class OrderDetailReq extends BaseRequest { ...@@ -85,6 +85,5 @@ public class OrderDetailReq extends BaseRequest {
//Epc类型（0固定资产1库存物资非固定资产） //Epc类型（0固定资产1库存物资非固定资产）
private Integer property; private Integer property;
//计划子单json
private String eqsJson;
} }
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/OrderMainReq.java
...@@ -127,6 +127,8 @@ public class OrderMainReq extends BaseRequest { ...@@ -127,6 +127,8 @@ public class OrderMainReq extends BaseRequest {
private String receiveUserId; private String receiveUserId;
//发物单位，有可能是组织机构也有可能是供应商 //发物单位，有可能是组织机构也有可能是供应商
private String name; private String name;
//计划子单json
private String eqsJson;
} }
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateEquipmentTypeReq.java
...@@ -38,7 +38,7 @@ public class UpdateEquipmentTypeReq { ...@@ -38,7 +38,7 @@ public class UpdateEquipmentTypeReq {
private String photo; private String photo;
private List<String> supplierList; private List<String> supplierList;
@NotNull(message = "时间戳不能为空",groups = {ValidationApi.export.class})
private Long updateTime; private Long updateTime;
private BigDecimal price; private BigDecimal price;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderDetailReq.java
...@@ -93,6 +93,5 @@ public class UpdateOrderDetailReq implements Serializable { ...@@ -93,6 +93,5 @@ public class UpdateOrderDetailReq implements Serializable {
//Epc类型（0固定资产1库存物资非固定资产） //Epc类型（0固定资产1库存物资非固定资产）
private Integer property; private Integer property;
//计划子单json
private String eqsJson;
} }
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderReq.java
...@@ -178,5 +178,7 @@ public class UpdateOrderReq extends BaseRequest implements Serializable { ...@@ -178,5 +178,7 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
private Long logSummaryId; private Long logSummaryId;
private Date createTime; private Date createTime;
//计划子单json
private String eqsJson;
} }
jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentTypeController.java
...@@ -52,7 +52,7 @@ public class EquipmentTypeController { ...@@ -52,7 +52,7 @@ public class EquipmentTypeController {
return ApiRes.success(equipmentTypeService.changeEquipmentState(req)); return ApiRes.success(equipmentTypeService.changeEquipmentState(req));
} }
@PostMapping(path="/ShowEquipmentList",name="查询类别列表#enable") @PostMapping(path="/",name="查询类别列表#enable")
@ApiOperation("查询类别列表") @ApiOperation("查询类别列表")
public ApiRes<List<EquipmentTypeDto>> ShowEquipmentList(@RequestBody QueryEquipmentTypeReq req) { public ApiRes<List<EquipmentTypeDto>> ShowEquipmentList(@RequestBody QueryEquipmentTypeReq req) {
return ApiRes.success(equipmentTypeService.getEquipmentList(req)); return ApiRes.success(equipmentTypeService.getEquipmentList(req));
...@@ -106,7 +106,7 @@ public class EquipmentTypeController { ...@@ -106,7 +106,7 @@ public class EquipmentTypeController {
@PostMapping(path="/alignTypeInfo",name="同步更新类型信息#enable") @PostMapping(path="/alignTypeInfo",name="同步更新类型信息#enable")
@ApiOperation("同步更新类型信息") @ApiOperation("同步更新类型信息")
public ApiRes<List<TypeDto>> alignTypeInfo(@RequestBody UpdateEquipmentTypeReq req){ public ApiRes<List<TypeDto>> alignTypeInfo(@RequestBody @Validated(ValidationApi.export.class) UpdateEquipmentTypeReq req){
return ApiRes.success(equipmentTypeService.alignTypeInfo(req)); return ApiRes.success(equipmentTypeService.alignTypeInfo(req));
} }
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PoliceController.java
...@@ -13,10 +13,7 @@ import com.junmp.jyzb.api.bean.req.CabinetPolicemanReq; ...@@ -13,10 +13,7 @@ import com.junmp.jyzb.api.bean.req.CabinetPolicemanReq;
import com.junmp.jyzb.api.bean.req.CabinetUploadReq; import com.junmp.jyzb.api.bean.req.CabinetUploadReq;
import com.junmp.jyzb.api.bean.req.UpdatePolicemanReq; import com.junmp.jyzb.api.bean.req.UpdatePolicemanReq;
import com.junmp.jyzb.api.bean.req.UpdateReassignmentReq; import com.junmp.jyzb.api.bean.req.UpdateReassignmentReq;
import com.junmp.jyzb.entity.EquipmentSize; import com.junmp.jyzb.entity.*;
import com.junmp.jyzb.entity.PoliceEquipment;
import com.junmp.jyzb.entity.Policeman;
import com.junmp.jyzb.entity.Reassignment;
import com.junmp.jyzb.service.PolicemanService; import com.junmp.jyzb.service.PolicemanService;
import com.junmp.jyzb.utils.ResponseResult; import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.v2.common.bean.request.ValidationApi; import com.junmp.v2.common.bean.request.ValidationApi;
...@@ -315,4 +312,9 @@ public class PoliceController { ...@@ -315,4 +312,9 @@ public class PoliceController {
return ApiRes.success(policemanService.alignUserInfo(req)); return ApiRes.success(policemanService.alignUserInfo(req));
} }
@PostMapping(path = "/oneClickAccountCreation",name = "一键生成账号（运维，管理，审核）#logType=30")
public ApiRes<Boolean> oneClickAccountCreation(@RequestBody PubOrg pubOrg){
return ApiRes.success(policemanService.oneClickAccountCreation(pubOrg));
}
} }
jyzb-biz/src/main/java/com/junmp/jyzb/entity/OrderDetail.java
...@@ -116,8 +116,4 @@ import java.util.Date; ...@@ -116,8 +116,4 @@ import java.util.Date;
@TableField(value = "property") @TableField(value = "property")
private Integer property; private Integer property;
@TableField(value = "eqs_json")
private String eqsJson;
} }
jyzb-biz/src/main/java/com/junmp/jyzb/entity/OrderMain.java
...@@ -164,5 +164,8 @@ public class OrderMain implements Serializable { ...@@ -164,5 +164,8 @@ public class OrderMain implements Serializable {
@TableField("detail_json") @TableField("detail_json")
private String detailJson; private String detailJson;
@TableField("eqs_json")
private String eqsJson;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PolicemanMapper.java
...@@ -62,4 +62,6 @@ public interface PolicemanMapper extends BaseMapper<Policeman> { ...@@ -62,4 +62,6 @@ public interface PolicemanMapper extends BaseMapper<Policeman> {
@Param("roleCodeList") List<String> roleCodeList); @Param("roleCodeList") List<String> roleCodeList);
List<UserDto> alignUserInfo(@Param("orgId") Long orgId, @Param("date")String date); List<UserDto> alignUserInfo(@Param("orgId") Long orgId, @Param("date")String date);
List<UserDto> oneClickAccountCreation(@Param("orgId") Long orgId);
} }
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/service/PolicemanService.java
...@@ -13,6 +13,7 @@ import com.junmp.jyzb.api.bean.query.QueryReassignmentReq; ...@@ -13,6 +13,7 @@ import com.junmp.jyzb.api.bean.query.QueryReassignmentReq;
import com.junmp.jyzb.api.bean.req.*; import com.junmp.jyzb.api.bean.req.*;
import com.junmp.jyzb.entity.PoliceEquipment; import com.junmp.jyzb.entity.PoliceEquipment;
import com.junmp.jyzb.entity.Policeman; import com.junmp.jyzb.entity.Policeman;
import com.junmp.jyzb.entity.PubOrg;
import com.junmp.jyzb.entity.Reassignment; import com.junmp.jyzb.entity.Reassignment;
import com.junmp.v2.common.bean.response.ApiRes; import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult; import com.junmp.v2.db.api.page.PageResult;
...@@ -121,4 +122,6 @@ public interface PolicemanService extends IService<Policeman> { ...@@ -121,4 +122,6 @@ public interface PolicemanService extends IService<Policeman> {
List<PoliceDto> alignPoliceInfo(PolicemanReq req); List<PoliceDto> alignPoliceInfo(PolicemanReq req);
List<UserDto> alignUserInfo(PolicemanReq req); List<UserDto> alignUserInfo(PolicemanReq req);
boolean oneClickAccountCreation(PubOrg pubOrg);
} }
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentTypeServiceImpl.java
...@@ -539,24 +539,6 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E ...@@ -539,24 +539,6 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
sizeAndType.setSizeList(CollectionUtil.isNotEmpty(collect1)?collect1:new ArrayList<>()); sizeAndType.setSizeList(CollectionUtil.isNotEmpty(collect1)?collect1:new ArrayList<>());
String jsonString = JSONObject.toJSONString(sizeAndType); String jsonString = JSONObject.toJSONString(sizeAndType);
// try {
// byte[] byKey = Arrays.copyOf("junmp888".getBytes(StandardCharsets.UTF_8), 8);
// byte[] iv = { (byte)0x12, (byte)0x34, (byte)0x56, (byte)0x78, (byte)0x90, (byte)0xAB, (byte)0xCD, (byte)0xEF };
//
// SecretKeySpec secretKeySpec = new SecretKeySpec(byKey, "DES");
// IvParameterSpec ivParameterSpec = new IvParameterSpec(iv);
//
// Cipher desCipher = Cipher.getInstance("DES/CBC/NoPadding");
// desCipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, ivParameterSpec);
//
// byte[] inputByteArray = jsonString.getBytes(StandardCharsets.UTF_8);
// byte[] encryptedBytes = desCipher.doFinal(inputByteArray);
//
// return Base64.getEncoder().encodeToString(encryptedBytes);
// } catch (Exception e) {
// e.printStackTrace();
// return "";
// }
try { try {
// 设置密钥和初始化向量 // 设置密钥和初始化向量
byte[] byKey = Arrays.copyOf("junmp888".getBytes(StandardCharsets.UTF_8), 8); byte[] byKey = Arrays.copyOf("junmp888".getBytes(StandardCharsets.UTF_8), 8);
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java
...@@ -58,6 +58,7 @@ import com.junmp.v2.sys.user.factory.SysUserCreateFactory; ...@@ -58,6 +58,7 @@ import com.junmp.v2.sys.user.factory.SysUserCreateFactory;
import com.junmp.v2.sys.user.service.SysUserOrgService; import com.junmp.v2.sys.user.service.SysUserOrgService;
import com.junmp.v2.sys.user.service.SysUserRoleService; import com.junmp.v2.sys.user.service.SysUserRoleService;
import com.junmp.v2.sys.user.service.SysUserService; import com.junmp.v2.sys.user.service.SysUserService;
import com.sun.org.apache.bcel.internal.generic.SWITCH;
import liquibase.pro.packaged.O; import liquibase.pro.packaged.O;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -2054,4 +2055,55 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -2054,4 +2055,55 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
return policemanMapper.alignUserInfo(orgId,date); return policemanMapper.alignUserInfo(orgId,date);
} }
@Override
@Transactional(rollbackFor = Exception.class)
public boolean oneClickAccountCreation(PubOrg pubOrg) {
//一次性创建一个组织机构下的三种系统账号（运维，仓管员，审核员）
//先判断一下前端是否传递组织机构编号（如果传递，指定创建该组织机构下的三种账号）
List<String> userAccountList=new ArrayList<>();
userAccountList.add("yw");
userAccountList.add("sh");
userAccountList.add("gl");
if (ObjectUtil.isNull(pubOrg.getOrgCode()) || pubOrg.getOrgCode().trim().isEmpty()){
//如果没有组织机构编号，需要判断全部组织机构下面是否已经存在对应的账号，如果存在则不创建账号，否则创建指定账号
List<UserDto> userDtos = policemanMapper.oneClickAccountCreation(null);
}else {
//如果有组织机构编号，则判断该组织机构下面是否已经存在账号，如果存在，则不进行创建，否则进行创建
PubOrg one = pubOrgService.getOne(new LambdaQueryWrapper<PubOrg>()
.eq(PubOrg::getOrgCode, pubOrg.getOrgCode()));
if (ObjectUtil.isNull(one)){
throw new ServiceException(OrgExceptionEnum.ORG_NOT_EXIST);
}
List<UserDto> userDtos = policemanMapper.oneClickAccountCreation(one.getOrgId());
if (CollectionUtil.isEmpty(userDtos)){
for (int i = 0; i < userAccountList.size(); i++) {
SysUser sysUser= new SysUser();
sysUser.setNickName(userAccountList.get(i)+one.getOrgCode());
sysUser.setRealName(userAccountList.get(i)+one.getOrgCode());
sysUser.setAccount(userAccountList.get(i)+one.getOrgCode());
SysUserCreateFactory.fillAddSysUser(sysUser);
sysUser.setAvatar(FileConstant.DEFAULT_AVATAR_FILE_ID);
sysUser.setDelFlag(LogicDelEnum.N.getCode());
sysUser.setCreateTime(DateTime.now());
sysUser.setUpdateTime(DateTime.now());
sysUserService.save(sysUser);
sysUserOrgService.add(sysUser.getUserId(), one.getOrgId(), null);
}
}else {
for (UserDto user:userDtos) {
boolean flag=false;
if (user.getAccount().equals("yw"+one.getOrgCode()) || user.getAccount().equals("sh"+one.getOrgCode())||user.getAccount().equals("gl"+one.getOrgCode())){
flag=true;
}
}
}
}
return false;
}
} }
jyzb-biz/src/main/java/com/junmp/jyzb/task/QueueBindExchangeAction.java 0 → 100644
package com.junmp.jyzb.task;
import com.junmp.jyzb.config.rabbitMQ.TopicRabbitConfig;
import com.junmp.v2.job.api.JobAction;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Slf4j
@Component
public class QueueBindExchangeAction implements JobAction {
@Autowired
TopicRabbitConfig topicRabbitConfig;
@Override
public void action() {
topicRabbitConfig.createQueuesAndBindings(topicRabbitConfig.topicExchange());
}
}
jyzb-biz/src/main/resources/mapper/PolicemanMapper.xml
...@@ -358,6 +358,17 @@ WHERE o.org_id IN ...@@ -358,6 +358,17 @@ WHERE o.org_id IN
where su.update_time &gt; #{date} where su.update_time &gt; #{date}
</if> </if>
</select> </select>
<select id="oneClickAccountCreation" resultType="com.junmp.jyzb.api.bean.dto.FetchingDataDto.UserDto">
select t.*,uo.org_id FROM (
SELECT u.* FROM `sys_user_copy1` u where u.account like "gl33%" or u.account like "yw33%" or u.account like "sh33%") as t
join sys_user_org_copy1 uo on t.user_id=uo.user_id
<if test="orgId != null and orgId != ''">
and uo.org_id=#{orgId}
</if>
join sys_user_role_copy1 ur on t.user_id=ur.user_id
join sys_role r on ur.role_id=r.role_id and r.role_id in ("1528003832557232130","1663372320355389441","1663372027127402498")
order by uo.org_id
</select>
</mapper> </mapper>
\ No newline at end of file
jyzb-process/src/main/java/com/junmp/junmpProcess/controller/SysFormController.java
...@@ -55,7 +55,7 @@ public class SysFormController { ...@@ -55,7 +55,7 @@ public class SysFormController {
return ApiRes.success(SysFormService.CheckConfig(br)); return ApiRes.success(SysFormService.CheckConfig(br));
} }
@ApiOperation("检查配置是否可用") @ApiOperation("检查配置是否可用")
@PostMapping(value = "CheckConfig") @PostMapping(value = "DeleteFormList")
public ApiRes<Boolean> DeleteFormList(@RequestBody String br) { public ApiRes<Boolean> DeleteFormList(@RequestBody String br) {
return ApiRes.success(SysFormService.DeleteFrom(br)); return ApiRes.success(SysFormService.DeleteFrom(br));
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论