diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java index 173e533b..4095d1f0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java @@ -37,7 +37,7 @@ import java.util.List; import java.util.Set; /** - * bomController + * 物料bom信息Controller * * @author ruoyi * @date 2023-11-21 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpUtbItemController.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpUtbItemController.java index 9f753e70..43ed7431 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpUtbItemController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpUtbItemController.java @@ -4,6 +4,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; + +import com.ruoyi.ck.utils.Result; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -167,6 +169,10 @@ public class ErpUtbItemController extends BaseController { return toAjax(erpUtbItemService.restoreErpUtbItemById(id)); } - + @PostMapping("/getId") + @ResponseBody + public Result getId() throws Exception { + return Result.getSuccessResult(erpUtbItemService.getId()); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java index 976f79c3..3365189f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java @@ -46,6 +46,10 @@ public class ErpMaterial extends BaseEntity private String productItem; /**技术团队名称 */ private String itemName; + /** 技术团队绩效(%) */ + private int itemCtc; + //技术团队利润率 + private String itemPR; /** 物料类型 */ private String materialType; /** 物料类型名称 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpUtbItemService.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpUtbItemService.java index 3fe53422..cee3ff73 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpUtbItemService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpUtbItemService.java @@ -70,4 +70,6 @@ public interface IErpUtbItemService * @return 结果 */ public int restoreErpUtbItemById(Long id); + + Object getId(); } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpUtbItemServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpUtbItemServiceImpl.java index d8999314..611cd855 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpUtbItemServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpUtbItemServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.erp.service.impl; import java.util.List; + +import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ShiroUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -21,7 +23,8 @@ public class ErpUtbItemServiceImpl implements IErpUtbItemService { @Autowired private ErpUtbItemMapper erpUtbItemMapper; - + @Autowired + private RedisCache redisCache; /** * 查询业务团队 * @@ -125,4 +128,9 @@ public class ErpUtbItemServiceImpl implements IErpUtbItemService { return erpUtbItemMapper.restoreErpUtbItemById(id); } + + @Override + public Object getId(){ + return redisCache.generateNo("YWTEAM"); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProductItemController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProductItemController.java index 24694714..13d26bff 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProductItemController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProductItemController.java @@ -1,5 +1,6 @@ package com.ruoyi.system.controller; +import com.ruoyi.ck.utils.Result; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -144,5 +145,9 @@ public class SysProductItemController extends BaseController return toAjax(sysProductItemService.restoreSysProductItemById(id)); } - + @PostMapping("/getId") + @ResponseBody + public Result getId() throws Exception { + return Result.getSuccessResult(sysProductItemService.getId()); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java index c266386a..b239130e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java @@ -304,7 +304,7 @@ public class SysSalesOrderController extends BaseController } /** - * 获取报价编号 + * 获取客户销售订单编号 */ @PostMapping("/getId") @ResponseBody diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProductItem.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProductItem.java index 28b1dd81..6b4d732c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProductItem.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProductItem.java @@ -16,9 +16,10 @@ public class SysProductItem extends BaseEntity private static final long serialVersionUID = 1L; /** 生产团队的id */ - @Excel(name = "生产团队的id") + @Excel(name = "生产团队的序号") private Long id; - + @Excel(name = "生产团队的ID") + private String productItemId; /** 生产团队类型 */ @Excel(name = "生产团队类型") private String types; @@ -30,10 +31,6 @@ public class SysProductItem extends BaseEntity /** 删除标志 0正常 1删除 */ private String delFlag; - /** 职能 */ - @Excel(name = "职能") - private String functions; - /** 电气技术人员 */ @Excel(name = "电气技术人员") private String dianqi; @@ -75,6 +72,15 @@ public class SysProductItem extends BaseEntity { return id; } + + public String getProductItemId() { + return productItemId; + } + + public void setProductItemId(String productItemId) { + this.productItemId = productItemId; + } + public void setTypes(String types) { this.types = types; @@ -102,15 +108,6 @@ public class SysProductItem extends BaseEntity { return delFlag; } - public void setFunctions(String functions) - { - this.functions = functions; - } - - public String getFunctions() - { - return functions; - } public void setDianqi(String dianqi) { this.dianqi = dianqi; @@ -188,6 +185,7 @@ public class SysProductItem extends BaseEntity public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("id", getId()) + .append("productItemId", getProductItemId()) .append("types", getTypes()) .append("productItem", getProductItem()) .append("createBy", getCreateBy()) @@ -195,7 +193,6 @@ public class SysProductItem extends BaseEntity .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) .append("delFlag", getDelFlag()) - .append("functions", getFunctions()) .append("dianqi", getDianqi()) .append("struct", getStruct()) .append("soft", getSoft()) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProductItemService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProductItemService.java index 50759ecd..4741632e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProductItemService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProductItemService.java @@ -75,4 +75,6 @@ public interface ISysProductItemService int restoreSysProductItemById(Long id); public List selectSysProductItemLists(); + + Object getId(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java index 0c7475b0..cc48b73f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java @@ -1,11 +1,13 @@ package com.ruoyi.system.service.impl; +import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.system.domain.SysCustomer; import com.ruoyi.system.mapper.SysCustomerMapper; import com.ruoyi.system.service.ISysCustomerService; +import io.swagger.annotations.OAuth2Definition; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,6 +27,9 @@ public class SysCustomerServiceImpl implements ISysCustomerService @Autowired private SysCustomerMapper sysCustomerMapper; + @Autowired + private RedisCache redisCache; + @Override public SysCustomer selectSysCustomerById(Long customerId) { return sysCustomerMapper.selectSysCustomerById(customerId); @@ -115,7 +120,6 @@ public class SysCustomerServiceImpl implements ISysCustomerService @Override public String getId() { - String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format("%3d"); - return "KH" + time.substring(2); + return redisCache.generateNo("KH"); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductItemServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductItemServiceImpl.java index f4e916be..ab93c337 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductItemServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductItemServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.system.service.impl; +import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ShiroUtils; @@ -23,6 +24,9 @@ public class SysProductItemServiceImpl implements ISysProductItemService @Autowired private SysProductItemMapper sysProductItemMapper; + @Autowired + private RedisCache redisCache; + /** * 查询生产团队 * @@ -59,6 +63,7 @@ public class SysProductItemServiceImpl implements ISysProductItemService String loginName = ShiroUtils.getLoginName(); sysProductItem.setCreateBy(loginName); sysProductItem.setCreateTime(DateUtils.getNowDate()); + redisCache.generateNo("JSTEAM"); return sysProductItemMapper.insertSysProductItem(sysProductItem); } @@ -130,4 +135,9 @@ public class SysProductItemServiceImpl implements ISysProductItemService SysProductItem sysProductItem = new SysProductItem(); return sysProductItemMapper.selectSysProductItemList(sysProductItem); } + + @Override + public Object getId() { + return redisCache.generateNo("JSTEAM"); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java index 327e9545..b8849541 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.system.service.impl; +import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.core.text.Convert; import com.ruoyi.system.domain.SysSalesOrder; import com.ruoyi.system.mapper.SysSalesOrderMapper; @@ -22,6 +23,9 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService @Autowired private SysSalesOrderMapper sysSalesOrderMapper; + @Autowired + private RedisCache redisCache; + /** * 查询销售订单 * @@ -96,7 +100,6 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService @Override public String getId() { - String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "SO" + time.substring(2); + return redisCache.generateBillNo("XS"); } } diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpUtbItemMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpUtbItemMapper.xml index 9f82ee06..ffa27f5b 100644 --- a/ruoyi-admin/src/main/resources/mapper/erp/ErpUtbItemMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpUtbItemMapper.xml @@ -29,11 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and utbId = #{utbId} and utbName like concat('%', #{utbName}, '%') - and salesman1 = #{salesman1} - and salesman2 = #{salesman2} - and salesman3 = #{salesman3} - and manage = #{manage} - and manager = #{manager} + and salesman1 like concat('%', #{salesman1}, '%') + and salesman2 like concat('%', #{salesman2}, '%') + and salesman3 like concat('%',#{salesman3}, '%') + and manage like concat('%', #{manage}, '%') + and manager like concat('%', #{manager}, '%') and create_time between #{params.beginCreateTime} and #{params.endCreateTime} diff --git a/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsDetailMapper.xml index 1c1c0653..44da9307 100644 --- a/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsDetailMapper.xml @@ -25,10 +25,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + - select delivery_goods_detail_id, notice_order_number, sales_order_number, enterprise_code, enterprise_name, finish_product_code, finish_product_name, specification_model, customer_number, type_machine, inventory_unit, common_currency, process_price, product_quantity, amount_money, line, version_number, sales_explain, standby_one, standby_two from delivery_goods_detail + select delivery_goods_detail_id, notice_order_number, sales_order_number, enterprise_code, enterprise_name, finish_product_code, finish_product_name, specification_model, customer_number, type_machine, inventory_unit, common_currency, process_price, product_quantity, amount_money, line, version_number, sales_explain, standby_one, standby_two,create_by, create_time, update_by, update_time, remark from delivery_goods_detail @@ -71,6 +77,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sales_explain, standby_one, standby_two, + create_by, + create_time #{deliveryGoodsDetailId}, @@ -93,6 +101,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{salesExplain}, #{standbyOne}, #{standbyTwo}, + #{createBy}, + now() @@ -118,6 +128,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sales_explain = #{salesExplain}, standby_one = #{standbyOne}, standby_two = #{standbyTwo}, + update_by = #{updateBy}, + update_time = CONCAT_WS(',',NOW(),update_time), where delivery_goods_detail_id = #{deliveryGoodsDetailId} diff --git a/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsNoticeMapper.xml b/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsNoticeMapper.xml index 13b72178..59dd7680 100644 --- a/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsNoticeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsNoticeMapper.xml @@ -23,10 +23,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + - select delivery_goods_notice_id, notice_order_number, delivery_date, enterprise_code, enterprise_name, customer_contact, customer_factory, delivery_address, export_sales, stock_number, stock_name, remarks, voucher_preparation, delivery_goods_flag, first_add_time, update_info_time, standby_one, standby_two from delivery_goods_notice + select delivery_goods_notice_id, notice_order_number, delivery_date, enterprise_code, enterprise_name, customer_contact, customer_factory, delivery_address, export_sales, stock_number, stock_name, remarks, voucher_preparation, delivery_goods_flag, first_add_time, update_info_time, standby_one, standby_two, create_by, create_time, update_by, update_time from delivery_goods_notice @@ -64,7 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delivery_goods_flag, standby_one, standby_two, + create_by, first_add_time, + create_time, #{noticeOrderNumber}, @@ -82,6 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{deliveryGoodsFlag}, #{standbyOne}, #{standbyTwo}, + #{createBy}, + NOW(), NOW(), @@ -105,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" standby_one = #{standbyOne}, standby_two = #{standbyTwo}, update_info_time = CONCAT_WS(',',NOW(),update_info_time), + update_time = CONCAT_WS(',',NOW(),update_time), where delivery_goods_notice_id = #{deliveryGoodsNoticeId} diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysProductItemMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysProductItemMapper.xml index 49de0acd..1c15aaa4 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysProductItemMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysProductItemMapper.xml @@ -6,6 +6,7 @@ + @@ -13,7 +14,6 @@ - @@ -25,25 +25,19 @@ - select id, types, productItem, create_by, create_time, update_by, updateTime, del_flag, functions, dianqi, struct, soft, test, zhuguan1, zhuguan2, manger, director from sys_product_item + select id,product_item_id, types, productItem, create_by, create_time, update_by, updateTime, del_flag, dianqi, struct, soft, test, zhuguan1, zhuguan2, manger, director from sys_product_item @@ -55,14 +49,12 @@ insert into sys_product_item - types, + product_item_id, productItem, create_by, create_time, update_by, updateTime, - del_flag, - functions, dianqi, struct, soft, @@ -71,16 +63,16 @@ zhuguan2, manger, director, + remark, + del_flag, - #{types}, + #{productItemId}, #{productItem}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, - #{delFlag}, - #{functions}, #{dianqi}, #{struct}, #{soft}, @@ -89,20 +81,18 @@ #{zhuguan2}, #{manger}, #{director}, + #{remark}, + #{delFlag}, update sys_product_item - types = #{types}, + product_item_id = #{productItemId}, productItem = #{productItem}, - create_by = #{createBy}, - create_time = #{createTime}, update_by = #{updateBy}, - updateTime = #{updateTime}, del_flag = #{delFlag}, - functions = #{functions}, dianqi = #{dianqi}, struct = #{struct}, soft = #{soft}, @@ -111,6 +101,7 @@ zhuguan2 = #{zhuguan2}, manger = #{manger}, director = #{director}, + updateTime = now() where id = #{id} @@ -133,5 +124,4 @@ update sys_product_item set del_flag = '0' where id = #{id} - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/erp/utb/add.html b/ruoyi-admin/src/main/resources/templates/erp/utb/add.html index 218842f9..9950d44c 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/utb/add.html +++ b/ruoyi-admin/src/main/resources/templates/erp/utb/add.html @@ -1,59 +1,128 @@ - +
-
- -
- + +
+
+

添加业务团队

-
-
- -
- + -
-
- -
- + +
+
+ +
+ +
+
+
+ +
+ +
+
-
- -
- +
+
+

业务员

-
-
- -
- +
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
-
- -
- +
+
+

业务服务员

-
-
- -
- +
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
-
- -
- +
+
+

经理和主管

+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
@@ -68,6 +137,22 @@ $.operate.save(prefix + "/add", $('#form-utb-add').serialize()); } } + //获取单号 + $.ajax({ + url: prefix + "/getId", + type: "post", + dateType: "json", + success: function (resp) { + if (resp.code === 0) { + $("input[name='utbId']").val(resp.data); + } else { + $.modal.msgError("失败啦"); + } + }, + error: function () { + $.modal.msgError("后台出错啦！"); + } + }); \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html b/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html index 2244d733..6302e2be 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html +++ b/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html @@ -57,15 +57,6 @@ 添加业务团队 - - - - - - - - -
diff --git a/ruoyi-admin/src/main/resources/templates/erp/utb/utbcoef.html b/ruoyi-admin/src/main/resources/templates/erp/utb/utbcoef.html index fb6c8b38..e82804db 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/utb/utbcoef.html +++ b/ruoyi-admin/src/main/resources/templates/erp/utb/utbcoef.html @@ -14,10 +14,18 @@

业务绩效配置

-
+

个人绩效（业务员、业务经理、业务主管）

+
+
+ 每个季度内，绩效金额区间 +
+
+ 绩效系数 +
+
@@ -70,12 +78,20 @@
-
+

团队绩效（业务经理）

-
+
+ 每个季度内，绩效金额区间 +
+
+ 绩效系数 +
+
+
+
超过 至 @@ -83,7 +99,7 @@ 以内*
-
+
超过 至 @@ -123,12 +139,21 @@ 以内*
+
-
+

团队绩效（业务主管）

+
+
+ 每个季度内，绩效金额区间 +
+
+ 绩效系数 +
+
超过 @@ -180,10 +205,18 @@
-
+

业务服务员（业务服务员）

+
+
+ 每个季度内，绩效金额区间 +
+
+ 绩效系数 +
+
超过 diff --git a/ruoyi-admin/src/main/resources/templates/main.html b/ruoyi-admin/src/main/resources/templates/main.html index 884ae7b8..46231768 100644 --- a/ruoyi-admin/src/main/resources/templates/main.html +++ b/ruoyi-admin/src/main/resources/templates/main.html @@ -176,7 +176,7 @@ contentType:'application/json;charset=utf-8', dataType:'json', success:function (data){ - console.log(data); + // console.log(data); $("#oderNolist").val(data); }, error:function (){ @@ -193,7 +193,7 @@ contentType:'application/json;charset=utf-8', dataType:'json', success:function (data){ - console.log(data); + // console.log(data); $("#oderNolist").val(data); }, error:function (){ @@ -201,7 +201,7 @@ } }); - + - + - + - + - + - + diff --git a/ruoyi-admin/src/main/resources/templates/system/item/add.html b/ruoyi-admin/src/main/resources/templates/system/item/add.html index c78a701a..acf6cf38 100644 --- a/ruoyi-admin/src/main/resources/templates/system/item/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/item/add.html @@ -6,70 +6,65 @@
-
- + +
+
- +
-
- +
+
- +
-
- +
+
- +
-
- +
+
- +
-
- +
+
- +
-
- +
+
- +
-
- +
+
- +
-
- +
+
- +
-
- +
+
- +
-
- +
+
- -
-
-
- -
- +
@@ -77,15 +72,28 @@ \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/item/edit.html b/ruoyi-admin/src/main/resources/templates/system/item/edit.html index 10b9dcf0..a210418d 100644 --- a/ruoyi-admin/src/main/resources/templates/system/item/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/item/edit.html @@ -1,76 +1,70 @@ - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
-
- -
- -
-
-
- +
+
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/item/item.html b/ruoyi-admin/src/main/resources/templates/system/item/item.html index 1e97571a..beb1fca0 100644 --- a/ruoyi-admin/src/main/resources/templates/system/item/item.html +++ b/ruoyi-admin/src/main/resources/templates/system/item/item.html @@ -11,56 +11,34 @@
  • - - + +
  • - - -
    • -
  • - +
  • - - -
    • -
  • - - -
    • -
  • - +
  • - +
  • - +
  • - +
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - +
  • + + + - +
  •  搜索 @@ -73,16 +51,7 @@
    @@ -108,77 +77,49 @@ restoreUrl: prefix + "/restore/{id}", exportUrl: prefix + "/export", modalName: "生产团队", - columns: [{ - checkbox: true - }, - { - field: 'id', - title: '生产团队的id', - visible: false - }, - { - field: 'types', - title: '生产团队类型' - }, - { - field: 'productItem', - title: '生产团队名称' - }, - { - field: 'updateTime', - title: '修改时间' - }, - { - field: 'functions', - title: '职能' - }, - { - field: 'dianqi', - title: '电气技术人员' - }, - { - field: 'struct', - title: '结构技术人员' - }, - { - field: 'soft', - title: '软件技术人员' - }, - { - field: 'test', - title: '测试技术人员' - }, - { - field: 'zhuguan1', - title: '主管1' - }, - { - field: 'zhuguan2', - title: '主管2' - }, - { - field: 'manger', - title: '经理' - }, - { - field: 'director', - title: '总监' - }, - { - title: '操作', - align: 'center', - formatter: function(value, row, index) { - var actions = []; - actions.push('编辑 '); - actions.push('删除 '); - if(row.delFlag == '0'){ - actions.push('作废 '); - }else{ - actions.push('恢复 '); + columns: [ + {checkbox: true}, + {title: '生产团队序号',field: 'id',visible: false}, + {title: '生产团队的id',field: 'productItemId'}, + {title: '生产团队名称', field: 'productItem',}, + {title: '电气', field: 'dianqi',}, + {title: '结构',field: 'struct',}, + {title: '软件',field: 'soft',}, + {title: '测试',field: 'test',}, + {title: '主管1',field: 'zhuguan1',}, + {title: '主管2',field: 'zhuguan2',}, + {title: '经理',field: 'manger',}, + {title: '总监',field: 'director',}, + {title: '备注',field: 'remark',}, + {title: '录入人',field: 'createBy',}, + {title: '录入时间',field: 'createTime',}, + { + field: 'updateBy', + title: '更新人', + }, + { + field: 'updateTime', + title: '上次修改时间', + formatter: function (value, row, index) { + if (value == null) { + return " "; + } else { + var vArr = value.split(',') + return vArr[0]; + } + } + }, + { + title: '操作', + align: 'center', + formatter: function(value, row, index) { + var actions = []; + actions.push('编辑 '); + actions.push('详情 '); + return actions.join(''); } - return actions.join(''); } - }] + ] }; $.table.init(options); }); diff --git a/ruoyi-admin/src/main/resources/templates/system/qutsourcingquotation/qutsourcingquotation.html b/ruoyi-admin/src/main/resources/templates/system/qutsourcingquotation/qutsourcingquotation.html index 40a18031..15adfcf9 100644 --- a/ruoyi-admin/src/main/resources/templates/system/qutsourcingquotation/qutsourcingquotation.html +++ b/ruoyi-admin/src/main/resources/templates/system/qutsourcingquotation/qutsourcingquotation.html @@ -306,216 +306,212 @@ columns: [{ checkbox: true }, - { - field: 'qutsourcingQuotationId', - title: '委外报价id', - visible: false - }, - { - field: 'auditNo', - title: '审核否', - formatter: function (value, row, index) { - // return $.table.selectDictLabel(auditNoDatas, value); - var actions = []; - if ($.table.selectDictLabel(auditNoDatas, value) == "是") { - actions.push('已审核 '); - } else { - actions.push('未审核 '); - } - return actions.join(''); - } - }, - { - field: 'confirmNo', - title: '确认否', - formatter: function (value, row, index) { - // return $.table.selectDictLabel(confirmNoDatas, value); - - var actions = []; - if ($.table.selectDictLabel(confirmNoDatas, value) == "是") { - actions.push('已确认 '); - } else { - actions.push('未确认 '); - } - return actions.join(''); - } - }, - { - field: 'approveNo', - title: '核准否', - formatter: function (value, row, index) { - // return $.table.selectDictLabel(confirmNoDatas, value); - - var actions = []; - if ($.table.selectDictLabel(approveNoDatas, value) == "是") { - actions.push('已核准 '); - } else { - actions.push('未核准 '); - } - return actions.join(''); - } - }, - { - field: 'quotationCode', - title: '报价编码' - }, - { - field: 'materialCode', - title: '物料代码' - }, - { - field: 'materialName', - title: '物料名称' - }, - { - field: 'specificationModel', - title: '规格型号' - }, - { - field: 'typeMachine', - title: '成品机种' - }, - { - field: 'measurementUnit', - title: '计量单位', - formatter: function (value, row, index) { - return $.table.selectDictLabel(measurementUnitDatas, value); - } - }, - { - field: 'commonCurrency', - title: '报价币别', - formatter: function (value, row, index) { - return $.table.selectDictLabel(commonCurrencyDatas, value); - } - }, - { - field: 'processPrice', - title: '加工单价' - }, - { - field: 'processingProcedureName', - title: '加工工序名称' - }, - { - field: 'processingProcedureCode', - title: '加工工序编号' - }, - { - field: 'converterCode', - title: '加工商编号' - }, - { - field: 'converterName', - title: '加工商名称' - }, - { - field: 'pricingDate', - title: '报价日期' - }, - { - field: 'inventoryUnit', - title: '库存单位', - formatter: function (value, row, index) { - return $.table.selectDictLabel(inventoryUnitDatas, value); + { + field: 'qutsourcingQuotationId', + title: '委外报价id', + visible: false + }, + { + field: 'auditNo', + title: '审核否', + formatter: function (value, row, index) { + return $.table.selectDictLabel(auditNoDatas, value); + } + }, + { + field: 'confirmNo', + title: '确认否', + visible: false, + formatter: function (value, row, index) { + // return $.table.selectDictLabel(confirmNoDatas, value); + + var actions = []; + if ($.table.selectDictLabel(confirmNoDatas, value) == "是") { + actions.push('已确认 '); + } else { + actions.push('未确认 '); } - }, - { - field: 'taxRate', - title: '交税税率' - }, - { - field: 'relationalFormula', - title: '每采购单位对应多少库存单位' - }, - { - field: 'quotationExplain', - title: '备注' - }, - { - field: 'currentQuote', - title: '是否为当前报价', - formatter: function (value, row, index) { - return $.table.selectDictLabel(currentQuoteDatas, value); + return actions.join(''); + } + }, + { + field: 'approveNo', + title: '核准否', + formatter: function (value, row, index) { + // return $.table.selectDictLabel(confirmNoDatas, value); + + var actions = []; + if ($.table.selectDictLabel(approveNoDatas, value) == "是") { + actions.push('已核准 '); + } else { + actions.push('未核准 '); } - }, - { - field: 'registrant', - title: '登记人' - }, - - { - field: 'confirmName', - title: '确认人' - }, - { - field: 'confirmTime', - title: '确认时间' - }, - - { - field: 'auditName', - title: '审核人' - }, - { - field: 'auditTime', - title: '审核时间' - }, - { - field: 'approveName', - title: '核准人' - }, - { - field: 'approveTime', - title: '核准时间' - }, - { - field: 'standbyOne', - title: '备用一', - visible: false - - }, - { - field: 'standbyTwo', - title: '备用二', - visible: false - - }, - { - field: 'firstAddTime', - title: '录入时间', - formatter: function (value, row, index) { - if (value == null) { - return " "; - } else { - return value; - } + return actions.join(''); + } + }, + { + field: 'quotationCode', + title: '报价编码' + }, + { + field: 'materialCode', + title: '物料代码' + }, + { + field: 'materialName', + title: '物料名称' + }, + { + field: 'measurementUnit', + title: '计量单位', + formatter: function (value, row, index) { + return $.table.selectDictLabel(measurementUnitDatas, value); + } + }, + { + field: 'commonCurrency', + title: '报价币别', + formatter: function (value, row, index) { + return $.table.selectDictLabel(commonCurrencyDatas, value); + } + }, + { + field: 'processPrice', + title: '加工单价' + }, + { + field: 'processingProcedureName', + title: '加工工序名称' + }, + { + field: 'processingProcedureCode', + title: '加工工序编号' + }, + { + field: 'converterCode', + title: '加工商编号' + }, + { + field: 'converterName', + title: '加工商名称' + }, + { + field: 'pricingDate', + title: '报价日期' + }, + { + field: 'inventoryUnit', + title: '库存单位', + formatter: function (value, row, index) { + return $.table.selectDictLabel(inventoryUnitDatas, value); + } + }, + { + field: 'taxRate', + title: '国内税率', + }, + { + field: 'relationalFormula', + title: '每采购单位对应多少库存单位', + visible: false + }, + { + field: 'quotationExplain', + title: '备注' + }, + { + field: 'currentQuote', + title: '是否为当前报价', + formatter: function (value, row, index) { + return $.table.selectDictLabel(currentQuoteDatas, value); + } + }, + { + field: 'registrant', + title: '登记人' + }, + + { + field: 'confirmName', + title: '确认人' + }, + { + field: 'confirmTime', + title: '确认时间' + }, + + { + field: 'auditName', + title: '审核人', + visible: false + }, + { + field: 'auditTime', + title: '审核时间', + visible: false + }, + { + field: 'approveName', + title: '核准人', + visible: false + }, + { + field: 'approveTime', + title: '核准时间', + visible: false + }, + { + field: 'standbyOne', + title: '备用一', + visible: false + }, + { + field: 'standbyTwo', + title: '备用二', + visible: false + + }, + { + field: 'firstAddTime', + title: '录入时间', + formatter: function (value, row, index) { + if (value == null) { + return " "; + } else { + return value; } - }, - { - field: 'updateInfoTime', - title: '上次修改时间', - formatter: function (value, row, index) { - if (value == null) { - return " "; - } else { - var vArr = value.split(',') - return vArr[0]; - } + } + }, + { + field: 'createBy', + title: '录入时间', + }, + { + field: 'updateBy', + title: '更新人' + }, + { + field: 'updateInfoTime', + title: '上次更新时间', + formatter: function (value, row, index) { + if (value == null) { + return " "; + } else { + var vArr = value.split(',') + return vArr[0]; } } - - // { - // title: '操作', - // align: 'center', - // formatter: function (value, row, index) { - // var actions = []; - // actions.push('编辑 '); - // actions.push('删除'); - // return actions.join(''); - // } - // } - ] + }, + { + title: '操作', + align: 'center', + formatter: function (value, row, index) { + var actions = []; + actions.push('编辑 '); + actions.push('删除'); + return actions.join(''); + } + }] }; $.table.init(options); }); diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html index 2b3dfcd6..28b8efab 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html @@ -86,7 +86,7 @@
-
--> +
@@ -114,13 +114,13 @@
- +
-
@@ -133,21 +133,13 @@
- -
-
-
- -
- +
- +
- - - - - - - -
@@ -595,7 +578,7 @@ $.modal.msgError(res.msg); } } - }) + }); // 添加成品 function addFinish() { diff --git a/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html b/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html index 686cbadd..ed8075cd 100644 --- a/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html +++ b/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html @@ -74,75 +74,24 @@ exportUrl: prefix + "/export", clickToSelect: true, modalName: "送货地址", - columns: [{ - checkbox: true - }, - { - field: 'deliveryId', - title: '送货id', + columns: [ + {checkbox: true}, + {title: '送货id',field: 'deliveryId'}, + {title: '客户/企业代码',field: 'enterpriseCode'}, + {title: '客户/企业名称',field: 'enterpriseName'}, + {title: '联系人电话',field: 'customerPhone'}, + {title: '联系人',field: 'customerName'}, + {title: '送货地址',field: 'deliveryAddress'}, + {title: '联系人2',field: 'customerNameTwo'}, + {title: '详细描述',field: 'detailedDescription'}, + {title: '厂区',field: 'plantArea'}, + {title: '邮编',field: 'postalCode'}, + {title: '传真',field: 'customerFax'}, + {title: '录入时间',field: 'firstAddTime', + formatter: function (value, row, index) {if (value == null) {return " ";}else {return value;}} }, - { - field: 'enterpriseCode', - title: '客户/企业代码' - }, - { - field: 'enterpriseName', - title: '客户/企业名称' - }, - { - field: 'customerPhone', - title: '联系人电话' - }, - { - field: 'customerName', - title: '联系人' - }, - { - field: 'deliveryAddress', - title: '送货地址' - }, - { - field: 'customerNameTwo', - title: '联系人2' - }, - { - field: 'detailedDescription', - title: '详细描述' - }, - { - field: 'plantArea', - title: '厂区' - }, - { - field: 'postalCode', - title: '邮编' - }, - { - field: 'customerFax', - title: '传真' - }, - { - field: 'firstAddTime', - title: '录入时间', - formatter: function (value, row, index) { - if (value == null) { - return " "; - } else { - return value; - } - } - }, - { - field: 'updateInfoTime', - title: '上次修改时间', - formatter: function (value, row, index) { - if (value == null) { - return " "; - } else { - var vArr = value.split(',') - return vArr[0]; - } - } + {title: '上次修改时间',field: 'updateInfoTime', + formatter: function (value, row, index) {if (value == null) {return " ";} else {var vArr = value.split(','); return vArr[0];}} } // { // title: '操作', @@ -154,7 +103,7 @@ // return actions.join(''); // } // } - ] + ] }; $.table.init(options); }); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java index a10cef0d..a424e9df 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java @@ -323,12 +323,12 @@ public class RedisCache no = Long.valueOf(get(codeKey).toString()); } //新增每日流水 - else{ - //每日流水设置3天过期,避免生成过多 - if(!set(codeKey,0,60*60*24*3)){ - throw new RuntimeException("Redis新增单据编号流水失败"); - } - } +// else{ +// //每日流水设置3天过期,避免生成过多 +// if(!set(codeKey,0,60*60*24*3)){ +// throw new RuntimeException("Redis新增单据编号流水失败"); +// } +// } no = incr(codeKey, 1); if (no == null) { throw new RuntimeException("Redis单据编号流水递增失败"); diff --git a/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm b/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm index f7f797df..6fb7b674 100644 --- a/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm +++ b/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm @@ -121,8 +121,8 @@ #if($column.pk) #elseif($column.list && "" != $dictType) { - field: '${javaField}', title: '${comment}', + field: '${javaField}', align: 'left', formatter: function(value, row, index) { return $.table.selectDictLabel#if($column.htmlType == "checkbox")s#end(${javaField}Datas, value); @@ -130,8 +130,8 @@ }, #elseif($column.list && "" != $javaField) { - field: '${javaField}', title: '${comment}', + field: '${javaField}', align: 'left' }, #end diff --git a/ruoyi-generator/src/main/resources/vm/html/list.html.vm b/ruoyi-generator/src/main/resources/vm/html/list.html.vm index a53c0cac..285347a3 100644 --- a/ruoyi-generator/src/main/resources/vm/html/list.html.vm +++ b/ruoyi-generator/src/main/resources/vm/html/list.html.vm @@ -121,22 +121,22 @@ #end #if($column.pk) { - field: '${javaField}', title: '${comment}', + field: '${javaField}', visible: false }, #elseif($column.list && "" != $dictType) { - field: '${javaField}', title: '${comment}', + field: '${javaField}', formatter: function(value, row, index) { return $.table.selectDictLabel#if($column.htmlType == "checkbox")s#end(${javaField}Datas, value); } }, #elseif($column.list && "" != $javaField) { + title: '${comment}', field: '${javaField}', - title: '${comment}' }, #end #end