From 52d78628a70d6aa129f874050b7846d259819554 Mon Sep 17 00:00:00 2001 From: skyouc <958836976@qq.com> Date: 星期三, 15 十月 2025 08:54:19 +0800 Subject: [PATCH] 物料同步接口优化 --- rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java | 2 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java | 18 ++-- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java | 22 ++-- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 46 +++++++---- rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseMatParms.java | 2 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java | 4 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemLogController.java | 18 ++-- version/db/init_role.sql | 98 ++++++++++++++++++++++++ 8 files changed, 158 insertions(+), 52 deletions(-) diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java index 8afd3a6..f48b330 100644 --- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java +++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java @@ -80,6 +80,4 @@ } return wmsErpService.orderDel(params); } - - } diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseMatParms.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseMatParms.java index cd13bb9..ee9e813 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseMatParms.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/BaseMatParms.java @@ -16,7 +16,7 @@ private String matnr; @ApiModelProperty("鐗╂枡鍒嗙粍") - private Long groupName; + private String groupName; @ApiModelProperty("鍨嬪彿") private String model; diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemLogController.java index 3a5f542..7d3edb4 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemLogController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemLogController.java @@ -26,7 +26,7 @@ @Autowired private AsnOrderItemLogService asnOrderItemLogService; - @PreAuthorize("hasAuthority('manager:asnOrderItemLog:list')") + @PreAuthorize("hasAuthority('manager:asnOrderLog:list')") @PostMapping("/asnOrderItemLog/page") public R page(@RequestBody Map<String, Object> map) { BaseParam baseParam = buildParam(map, BaseParam.class); @@ -34,25 +34,25 @@ return R.ok().add(asnOrderItemLogService.page(pageParam, pageParam.buildWrapper(true))); } - @PreAuthorize("hasAuthority('manager:asnOrderItemLog:list')") + @PreAuthorize("hasAuthority('manager:asnOrderLog:list')") @PostMapping("/asnOrderItemLog/list") public R list(@RequestBody Map<String, Object> map) { return R.ok().add(asnOrderItemLogService.list()); } - @PreAuthorize("hasAuthority('manager:asnOrderItemLog:list')") + @PreAuthorize("hasAuthority('manager:asnOrderLog:list')") @PostMapping({"/asnOrderItemLog/many/{ids}", "/asnOrderItemLogs/many/{ids}"}) public R many(@PathVariable Long[] ids) { return R.ok().add(asnOrderItemLogService.listByIds(Arrays.asList(ids))); } - @PreAuthorize("hasAuthority('manager:asnOrderItemLog:list')") + @PreAuthorize("hasAuthority('manager:asnOrderLog:list')") @GetMapping("/asnOrderItemLog/{id}") public R get(@PathVariable("id") Long id) { return R.ok().add(asnOrderItemLogService.getById(id)); } - @PreAuthorize("hasAuthority('manager:asnOrderItemLog:save')") + @PreAuthorize("hasAuthority('manager:asnOrderLog:save')") @OperationLog("Create Asn order logs") @PostMapping("/asnOrderItemLog/save") public R save(@RequestBody AsnOrderItemLog asnOrderItemLog) { @@ -66,7 +66,7 @@ return R.ok("Save Success").add(asnOrderItemLog); } - @PreAuthorize("hasAuthority('manager:asnOrderItemLog:update')") + @PreAuthorize("hasAuthority('manager:asnOrderLog:update')") @OperationLog("Update Asn order logs") @PostMapping("/asnOrderItemLog/update") public R update(@RequestBody AsnOrderItemLog asnOrderItemLog) { @@ -78,7 +78,7 @@ return R.ok("Update Success").add(asnOrderItemLog); } - @PreAuthorize("hasAuthority('manager:asnOrderItemLog:remove')") + @PreAuthorize("hasAuthority('manager:asnOrderLog:remove')") @OperationLog("Delete Asn order logs") @PostMapping("/asnOrderItemLog/remove/{ids}") public R remove(@PathVariable Long[] ids) { @@ -88,7 +88,7 @@ return R.ok("Delete Success").add(ids); } - @PreAuthorize("hasAuthority('manager:asnOrderItemLog:list')") + @PreAuthorize("hasAuthority('manager:asnOrderLog:list')") @PostMapping("/asnOrderItemLog/query") public R query(@RequestParam(required = false) String condition) { List<KeyValVo> vos = new ArrayList<>(); @@ -102,7 +102,7 @@ return R.ok().add(vos); } - @PreAuthorize("hasAuthority('manager:asnOrderItemLog:list')") + @PreAuthorize("hasAuthority('manager:asnOrderLog:list')") @PostMapping("/asnOrderItemLog/export") public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception { LambdaQueryWrapper<AsnOrderItemLog> itemLogLambdaQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java index 844c06b..cf40d82 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java @@ -27,7 +27,7 @@ @Autowired private StockItemService stockItemService; - @PreAuthorize("hasAuthority('manager:stockItem:list')") + @PreAuthorize("hasAuthority('manager:stock:list')") @PostMapping("/stockItem/page") public R page(@RequestBody Map<String, Object> map) { BaseParam baseParam = buildParam(map, BaseParam.class); @@ -35,25 +35,25 @@ return R.ok().add(stockItemService.page(pageParam, pageParam.buildWrapper(true))); } - @PreAuthorize("hasAuthority('manager:stockItem:list')") + @PreAuthorize("hasAuthority('manager:stock:list')") @PostMapping("/stockItem/list") public R list(@RequestBody Map<String, Object> map) { return R.ok().add(stockItemService.list()); } - @PreAuthorize("hasAuthority('manager:stockItem:list')") + @PreAuthorize("hasAuthority('manager:stock:list')") @PostMapping({"/stockItem/many/{ids}", "/stockItems/many/{ids}"}) public R many(@PathVariable Long[] ids) { return R.ok().add(stockItemService.listByIds(Arrays.asList(ids))); } - @PreAuthorize("hasAuthority('manager:stockItem:list')") + @PreAuthorize("hasAuthority('manager:stock:list')") @GetMapping("/stockItem/{id}") public R get(@PathVariable("id") Long id) { return R.ok().add(stockItemService.getById(id)); } - @PreAuthorize("hasAuthority('manager:stockItem:save')") + @PreAuthorize("hasAuthority('manager:stock:save')") @OperationLog("Create 搴撳瓨鏄庣粏琛�") @PostMapping("/stockItem/save") public R save(@RequestBody StockItem stockItem) { @@ -67,7 +67,7 @@ return R.ok("Save Success").add(stockItem); } - @PreAuthorize("hasAuthority('manager:stockItem:update')") + @PreAuthorize("hasAuthority('manager:stock:update')") @OperationLog("Update 搴撳瓨鏄庣粏琛�") @PostMapping("/stockItem/update") public R update(@RequestBody StockItem stockItem) { @@ -79,7 +79,7 @@ return R.ok("Update Success").add(stockItem); } - @PreAuthorize("hasAuthority('manager:stockItem:remove')") + @PreAuthorize("hasAuthority('manager:stock:remove')") @OperationLog("Delete 搴撳瓨鏄庣粏琛�") @PostMapping("/stockItem/remove/{ids}") public R remove(@PathVariable Long[] ids) { @@ -89,7 +89,7 @@ return R.ok("Delete Success").add(ids); } - @PreAuthorize("hasAuthority('manager:stockItem:list')") + @PreAuthorize("hasAuthority('manager:stock:list')") @PostMapping("/stockItem/query") public R query(@RequestParam(required = false) String condition) { List<KeyValVo> vos = new ArrayList<>(); @@ -103,7 +103,7 @@ return R.ok().add(vos); } - @PreAuthorize("hasAuthority('manager:stockItem:list')") + @PreAuthorize("hasAuthority('manager:stock:list')") @PostMapping("/stockItem/export") public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception { ExcelUtil.build(ExcelUtil.create(stockItemService.list(), StockItem.class), response); diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java index 5f22c54..e2c3536 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java @@ -42,7 +42,7 @@ @Autowired private CompanysService companysService; - @PreAuthorize("hasAuthority('manager:asnOrderItem:list')") + @PreAuthorize("hasAuthority('manager:asnOrder:list')") @ApiOperation("鍒嗛〉鑾峰彇鍒楄〃") @PostMapping("/asnOrderItem/page") public R page(@RequestBody Map<String, Object> map) { @@ -61,25 +61,25 @@ return R.ok(page); } - @PreAuthorize("hasAuthority('manager:asnOrderItem:list')") + @PreAuthorize("hasAuthority('manager:asnOrder:list')") @PostMapping("/asnOrderItem/list") public R list(@RequestBody Map<String, Object> map) { return R.ok().add(asnOrderItemService.list()); } - @PreAuthorize("hasAuthority('manager:asnOrderItem:list')") + @PreAuthorize("hasAuthority('manager:asnOrder:list')") @PostMapping({"/asnOrderItem/many/{ids}", "/asnOrderItems/many/{ids}"}) public R many(@PathVariable Long[] ids) { return R.ok().add(asnOrderItemService.listByIds(Arrays.asList(ids))); } - @PreAuthorize("hasAuthority('manager:asnOrderItem:list')") + @PreAuthorize("hasAuthority('manager:asnOrder:list')") @GetMapping("/asnOrderItem/{id}") public R get(@PathVariable("id") Long id) { return R.ok().add(asnOrderItemService.getById(id)); } - @PreAuthorize("hasAuthority('manager:asnOrderItem:save')") + @PreAuthorize("hasAuthority('manager:asnOrder:save')") @OperationLog("Create ASN鍗曟嵁") @PostMapping("/asnOrderItem/save") public R save(@RequestBody Map<String, Object> params) { @@ -96,7 +96,7 @@ } - @PreAuthorize("hasAuthority('manager:asnOrderItem:update')") + @PreAuthorize("hasAuthority('manager:asnOrder:update')") @OperationLog("Update ASN鍗曟嵁") @PostMapping("/asnOrderItem/update") public R update(@RequestBody WkOrderItem wkOrderItem) { @@ -116,7 +116,7 @@ return R.ok("Update Success").add(wkOrderItem); } - @PreAuthorize("hasAuthority('manager:asnOrderItem:remove')") + @PreAuthorize("hasAuthority('manager:asnOrder:remove')") @OperationLog("Delete ASN鍗曟嵁") @PostMapping("/asnOrderItem/remove/{ids}") public R remove(@PathVariable Long[] ids) { @@ -126,7 +126,7 @@ return R.ok("Delete Success").add(ids); } - @PreAuthorize("hasAuthority('manager:asnOrderItem:list')") + @PreAuthorize("hasAuthority('manager:asnOrder:list')") @PostMapping("/asnOrderItem/query") public R query(@RequestParam(required = false) String condition) { List<KeyValVo> vos = new ArrayList<>(); @@ -140,7 +140,7 @@ return R.ok().add(vos); } - @PreAuthorize("hasAuthority('manager:asnOrderItem:list')") + @PreAuthorize("hasAuthority('manager:asnOrder:list')") @PostMapping("/asnOrderItem/export") @ApiOperation("瀵煎嚭鏀惰揣閫氱煡鍗曟槑缁�") public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception { @@ -179,7 +179,7 @@ */ @PostMapping("/asnOrderItem/import") @ApiOperation("ASN瀵煎叆鎺ュ彛") - @PreAuthorize("hasAuthority('manager:asnOrderItem:update')") + @PreAuthorize("hasAuthority('manager:asnOrder:update')") public R importExcel(@RequestParam(value = "file") MultipartFile file) throws Exception { if (Objects.isNull(file)) { return R.error("鏂囦欢涓嶈兘涓虹┖锛侊紒"); @@ -197,7 +197,7 @@ */ @PostMapping("/asnOrderItem/template/download") @ApiOperation("涓嬭浇鏀惰揣鍗曟ā鏉�") - @PreAuthorize("hasAuthority('manager:asnOrderItem:update')") + @PreAuthorize("hasAuthority('manager:asnOrder:update')") public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception { AsnOrderTemplate template = ExcelUtil.mockData(AsnOrderTemplate.class); List<AsnOrderTemplate> list = Arrays.asList(template); diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java index d488f6e..3c3945e 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/MatnrsTemplate.java @@ -34,13 +34,13 @@ @Excel(name = "璐т富鏍囪瘑") @ExcelComment(example = "123") - private Long shipperId; + private String shipperId; @NotNull @Excel(name = "鐗╂枡鍒嗙粍") @ExcelComment(example = "鎵嬫満") - private Long groupId; + private String groupId; @Excel(name = "ERP缂栫爜") diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java index 181193c..524ce11 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.server.common.domain.BaseParam; @@ -24,6 +23,7 @@ import com.vincent.rsf.server.manager.service.MatnrService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.vincent.rsf.server.system.constant.SerialRuleCode; +import com.vincent.rsf.server.system.service.FieldsService; import com.vincent.rsf.server.system.utils.SerialRuleUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -41,6 +41,9 @@ @Autowired private MatnrGroupService matnrGroupService; + + @Autowired + private FieldsService fieldsService; /** * @return @@ -75,6 +78,7 @@ * @param list * @return */ + @Override public List<Matnr> getMatnrTempletes(List<MatnrsTemplate> list) { List<Matnr> matnrs = new ArrayList<>(); list.forEach(template -> { @@ -82,6 +86,7 @@ matnr.setBarcode(template.getBarcode()) .setCode(template.getCode()) .setName(template.getName()) + .setId(null) .setDescrible(template.getDescrible()) .setColor(template.getColor()) .setFlagCheck(!Objects.isNull(template.getFlagCheck()) ? Short.parseShort(template.getFlagCheck()) : 0) @@ -90,36 +95,41 @@ .setValid(!Objects.isNull(template.getValid()) ? Integer.parseInt( template.getValid()) : 0) .setUnit(template.getUnit()) .setStockUnit(template.getPurUnit()) - .setShipperId(template.getShipperId()) .setSize(template.getSize()) .setSpec(template.getSpec()) .setStagn(!Objects.isNull(template.getStagn()) ? Integer.parseInt(template.getStagn()) : 0) .setModel(template.getModel()) .setGroupCode(template.getGroupCode()) .setPurUnit(template.getPurUnit()) - .setStockLevel(MatnrLocLevel.getTypeVal(template.getStockLevel())) + .setStockLevel(!Objects.isNull(template.getStockLevel()) ? MatnrLocLevel.getTypeVal(template.getStockLevel()) : null) .setSafeQty(!Objects.isNull(template.getSafeQty()) ? Double.parseDouble(template.getSafeQty()) : 0) .setMinQty(!Objects.isNull(template.getMinQty()) ? Double.parseDouble(template.getMinQty()) : 0); if (!Objects.isNull(template.getGroupCode()) || !Objects.isNull(template.getGroupName())) { MatnrGroup matnrGroups = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>() .eq(!Objects.isNull(template.getGroupCode()), MatnrGroup::getCode, template.getGroupCode()) - .eq(!Objects.isNull(template.getGroupName()),MatnrGroup::getName, template.getGroupName())); - matnr.setGroupId(matnrGroups.getId()); - } - //鑾峰彇鍔ㄦ�佸瓧娈碉紝骞朵繚瀛樻槑缁嗗唴瀹� - if (!FieldsUtils.getFieldsSta().isEmpty()) { - //淇濆瓨鐗╂枡鎵╁睍灞炴�у�� - try { - Map<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(template), Map.class); - String uuid = CommonUtil.randomUUID16(); - boolean b = FieldsUtils.saveFields(map, uuid); - if (b) { - matnr.setFieldsIndex(uuid); - } - } catch (Exception e) { - throw new RuntimeException(e); + .eq(!Objects.isNull(template.getGroupName()), MatnrGroup::getName, template.getGroupName())); + if (!Objects.isNull(matnrGroups)) { + matnr.setGroupId(matnrGroups.getId()).setGroupCode(matnrGroups.getCode()); } } +// List<Fields> fields = fieldsService.list(new LambdaQueryWrapper<Fields>() +// .eq(Fields::getUnique, CommonStatus.COMMONSTATUS_NO.val) +// .eq(Fields::getFlagEnable, CommonStatus.COMMONSTATUS_YES.val)); +// +// //鑾峰彇鍔ㄦ�佸瓧娈碉紝骞朵繚瀛樻槑缁嗗唴瀹� +// if (!fields.isEmpty()) { +// //淇濆瓨鐗╂枡鎵╁睍灞炴�у�� +// try { +// Map<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(template), Map.class); +// String uuid = CommonUtil.randomUUID16(); +// boolean b = FieldsUtils.saveFields(map, uuid); +// if (b) { +// matnr.setFieldsIndex(uuid); +// } +// } catch (Exception e) { +// throw new RuntimeException(e); +// } +// } matnrs.add(matnr); }); return matnrs; diff --git a/version/db/init_role.sql b/version/db/init_role.sql new file mode 100644 index 0000000..41ef4fa --- /dev/null +++ b/version/db/init_role.sql @@ -0,0 +1,98 @@ +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 274); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 273); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 272); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 271); + +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 84); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 85); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 86); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 87); + +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 3); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 4); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 5); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 6); + +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 58); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 59); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 60); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 61); + + +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 109); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 110); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 111); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 112); + +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 114); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 115); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 116); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 117); + +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 163); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 164); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 165); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 166); + + +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 168); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 169); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 170); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 171); + + +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 201); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 202); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 203); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 204); + +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 69); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 70); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 71); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 72); + +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 79); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 80); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 81); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 82); + +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 371); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 372); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 373); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 374); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 375); + +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 378); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 379); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 380); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 381); + +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 296); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 297); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 298); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 299); + + + +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 382); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 383); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 384); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 385); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 386); + +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 361); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 362); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 363); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 364); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 365); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 366); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 367); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 368); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 369); +INSERT INTO `rsf-xiri`.`sys_role_menu` ( `role_id`, `menu_id`) VALUES ( 2, 370); + + + + + + -- Gitblit v1.9.1