diff --git a/jshERP-boot/docs/jsh_erp.sql b/jshERP-boot/docs/jsh_erp.sql index fa43d9ff..df171473 100644 --- a/jshERP-boot/docs/jsh_erp.sql +++ b/jshERP-boot/docs/jsh_erp.sql @@ -160,7 +160,7 @@ CREATE TABLE `jsh_depot_head` ( `bill_type` varchar(50) DEFAULT NULL COMMENT '单据类型', `remark` varchar(1000) DEFAULT NULL COMMENT '备注', `file_name` varchar(1000) DEFAULT NULL COMMENT '附件名称', - `sales_man` varchar(50) DEFAULT NULL COMMENT '业务员(可以多个)', + `sales_man` varchar(50) DEFAULT NULL COMMENT '销售员(可以多个)', `account_id_list` varchar(50) DEFAULT NULL COMMENT '多账户ID列表', `account_money_list` varchar(200) DEFAULT NULL COMMENT '多账户金额列表', `discount` decimal(24,6) DEFAULT NULL COMMENT '优惠率', @@ -687,7 +687,7 @@ CREATE TABLE `jsh_person` ( -- ---------------------------- -- Records of jsh_person -- ---------------------------- -INSERT INTO `jsh_person` VALUES ('14', '业务员', '小李', '', null, '63', '0'); +INSERT INTO `jsh_person` VALUES ('14', '销售员', '小李', '', null, '63', '0'); INSERT INTO `jsh_person` VALUES ('15', '仓管员', '小军', '', null, '63', '0'); INSERT INTO `jsh_person` VALUES ('16', '财务员', '小夏', '', null, '63', '0'); INSERT INTO `jsh_person` VALUES ('17', '财务员', '小曹', '', null, '63', '0'); diff --git a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt index 6e189b69..c9947c19 100644 --- a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt +++ b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt @@ -972,7 +972,7 @@ alter table jsh_depot_head change ChangeAmount change_amount decimal(24,6) DEFAU alter table jsh_depot_head change TotalPrice total_price decimal(24,6) DEFAULT NULL COMMENT '合计金额'; alter table jsh_depot_head change PayType pay_type varchar(50) DEFAULT NULL COMMENT '付款类型(现金、记账等)'; alter table jsh_depot_head change Remark remark varchar(1000) DEFAULT NULL COMMENT '备注'; -alter table jsh_depot_head change Salesman sales_man varchar(50) DEFAULT NULL COMMENT '业务员(可以多个)'; +alter table jsh_depot_head change Salesman sales_man varchar(50) DEFAULT NULL COMMENT '销售员(可以多个)'; alter table jsh_depot_head change AccountIdList account_id_list varchar(50) DEFAULT NULL COMMENT '多账户ID列表'; alter table jsh_depot_head change AccountMoneyList account_money_list varchar(200) DEFAULT NULL COMMENT '多账户金额列表'; alter table jsh_depot_head change Discount discount decimal(24,6) DEFAULT NULL COMMENT '优惠率'; @@ -1532,4 +1532,11 @@ INSERT INTO `jsh_platform_config` (`platform_key`, `platform_key_info`, `platfor -- 更新功能菜单里面的按钮参数(执行完之后记得要给'租户'角色重新勾选按钮) -- -------------------------------------------------------- update jsh_function set push_btn='1,2,3,7' where push_btn='1,2,7'; -update jsh_function set push_btn='1,3' where number in ('01020101','01020102','01020103','010102'); \ No newline at end of file +update jsh_function set push_btn='1,3' where number in ('01020101','01020102','01020103','010102'); + +-- -------------------------------------------------------- +-- 时间 2023年11月1日 +-- by jishenghua +-- 将经手人里面的业务员改为销售员 +-- -------------------------------------------------------- +update jsh_person set type='销售员' where type='业务员'; \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/PersonController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/PersonController.java index 708cc060..86ec95ff 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/PersonController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/PersonController.java @@ -108,20 +108,20 @@ public class PersonController { } /** - * 根据类型获取经手人信息 1-业务员,2-仓管员,3-财务员 + * 根据类型获取经手人信息 1-销售员,2-仓管员,3-财务员 * @param typeNum * @param request * @return */ @GetMapping(value = "/getPersonByNumType") - @ApiOperation(value = "根据类型获取经手人信息1-业务员,2-仓管员,3-财务员") + @ApiOperation(value = "根据类型获取经手人信息1-销售员,2-仓管员,3-财务员") public JSONArray getPersonByNumType(@RequestParam("type") String typeNum, HttpServletRequest request)throws Exception { JSONArray dataArray = new JSONArray(); try { String type = ""; if (typeNum.equals("1")) { - type = "业务员"; + type = "销售员"; } else if (typeNum.equals("2")) { type = "仓管员"; } else if (typeNum.equals("3")) {