From 630faad352a2cf7a0be170eb42c1702313632da5 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Mon, 12 Sep 2022 10:23:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=B7=BB=E5=8A=A0=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E4=BF=A1=E6=81=AF=E5=8F=82=E6=95=B0=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/SystemParamConfigController.java | 33 +++++++++++++++++ .../admin/entity/basic/UdiInfoEntity.java | 10 +++++ .../entity/inout/StockOrderPrintEntity.java | 11 ++++++ .../entity/param/ProductRemarkSetEntity.java | 34 +++++++++++++++++ .../req/param/SystemParamConfigRequest.java | 2 +- .../admin/res/basic/UdiRelevanceResponse.java | 11 ++++++ .../impl/SystemParamConfigServiceImpl.java | 9 +++-- .../mybatis/mapper/basic/UdiInfoDao.xml | 8 ++++ .../mybatis/mapper/inout/StockOrderDao.xml | 13 +++++-- .../mapper/param/SystemParamConfigDao.xml | 37 +++++++++++-------- 10 files changed, 146 insertions(+), 22 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/entity/param/ProductRemarkSetEntity.java diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemParamConfigController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemParamConfigController.java index b26be32..a031e95 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemParamConfigController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemParamConfigController.java @@ -1,9 +1,12 @@ package com.glxp.sale.admin.controller.param; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ReflectUtil; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.dao.info.ScheduledDao; import com.glxp.sale.admin.entity.info.ScheduledEntity; +import com.glxp.sale.admin.entity.param.ProductRemarkSetEntity; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.req.param.SystemParamConfigRequest; import com.glxp.sale.admin.req.param.SystemParamConfigSaveRequest; @@ -156,4 +159,34 @@ public class SystemParamConfigController { SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey(systemParamConfigRequest.getParamKey()); return ResultVOUtils.success(systemParamConfigEntity); } + + + //获取耗材字典备用字段设置 + @AuthRuleAnnotation("") + @GetMapping("/udiwms/sys/config/selectByBasic") + public BaseResponse selectByBasic() { + SystemParamConfigRequest systemParamConfigRequest = new SystemParamConfigRequest(); + systemParamConfigRequest.setParamType(2); + systemParamConfigRequest.setParamStatus(1); + List systemParamConfigEntities = systemParamConfigService.queryPage(systemParamConfigRequest); + ProductRemarkSetEntity productRemarkSetEntity = new ProductRemarkSetEntity(); + + if (CollUtil.isNotEmpty(systemParamConfigEntities) && systemParamConfigEntities.size() == 8) { + for (int i = 0; i < systemParamConfigEntities.size(); i++) { + + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntities.get(i); + ReflectUtil.setFieldValue(productRemarkSetEntity, "remarkKey" + (i + 1), systemParamConfigEntity.getParamKey()); + + if (!systemParamConfigEntity.getParamValue().equals("0")) { + ReflectUtil.setFieldValue(productRemarkSetEntity, "remarkTitle" + (i + 1), systemParamConfigEntity.getParamValue()); + ReflectUtil.setFieldValue(productRemarkSetEntity, "remarkEnable" + (i + 1), true); + } else { + ReflectUtil.setFieldValue(productRemarkSetEntity, "remarkEnable" + (i + 1), false); + } + + + } + } + return ResultVOUtils.success(productRemarkSetEntity); + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java index 93694fc..c1a35c7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java @@ -72,6 +72,16 @@ public class UdiInfoEntity { //产品代理商 private String cpdls; + + private String basicPrductRemak1; + private String basicPrductRemak2; + private String basicPrductRemak3; + private String basicPrductRemak4; + private String basicPrductRemak5; + private String basicPrductRemak6; + private String basicPrductRemak7; + private String basicPrductRemak8; + public Integer getId() { return id; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java index b1bc189..39b4139 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java @@ -54,4 +54,15 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity { private String deptName; private String orderRemark; private String billRemark; + + + private String basicPrductRemak1; + private String basicPrductRemak2; + private String basicPrductRemak3; + private String basicPrductRemak4; + private String basicPrductRemak5; + private String basicPrductRemak6; + private String basicPrductRemak7; + private String basicPrductRemak8; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/param/ProductRemarkSetEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/ProductRemarkSetEntity.java new file mode 100644 index 0000000..b6120d4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/param/ProductRemarkSetEntity.java @@ -0,0 +1,34 @@ +package com.glxp.sale.admin.entity.param; + +import lombok.Data; + +@Data +public class ProductRemarkSetEntity { + + + private String remarkKey1; + private String remarkKey2; + private String remarkKey3; + private String remarkKey4; + private String remarkKey6; + private String remarkKey5; + private String remarkKey7; + private String remarkKey8; + private String remarkTitle1; + private String remarkTitle2; + private String remarkTitle3; + private String remarkTitle4; + private String remarkTitle5; + private String remarkTitle6; + private String remarkTitle7; + private String remarkTitle8; + private boolean remarkEnable1; + private boolean remarkEnable2; + private boolean remarkEnable4; + private boolean remarkEnable3; + private boolean remarkEnable5; + private boolean remarkEnable6; + private boolean remarkEnable7; + private boolean remarkEnable8; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemParamConfigRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemParamConfigRequest.java index 2eb11fc..07179a2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemParamConfigRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemParamConfigRequest.java @@ -14,6 +14,6 @@ public class SystemParamConfigRequest extends ListPageRequest { private String paramKey; private String paramValue; private int paramStatus; - private int paramType; + private Integer paramType; private String paramExplain; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java index 275f03f..d8c4f64 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java @@ -76,6 +76,17 @@ public class UdiRelevanceResponse { private String price; + + private String basicPrductRemak1; + private String basicPrductRemak2; + private String basicPrductRemak3; + private String basicPrductRemak4; + private String basicPrductRemak5; + private String basicPrductRemak6; + private String basicPrductRemak7; + private String basicPrductRemak8; + + //产品代理商 private String cpdls; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/param/impl/SystemParamConfigServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/param/impl/SystemParamConfigServiceImpl.java index ccde086..88153b8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/param/impl/SystemParamConfigServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/param/impl/SystemParamConfigServiceImpl.java @@ -18,8 +18,11 @@ public class SystemParamConfigServiceImpl implements SystemParamConfigService { @Override public List queryPage(SystemParamConfigRequest SystemParamConfigRequest) { - int offset = (SystemParamConfigRequest.getPage() - 1) * SystemParamConfigRequest.getLimit(); - PageHelper.offsetPage(offset, SystemParamConfigRequest.getLimit()); + + if (SystemParamConfigRequest.getPage() != null) { + int offset = (SystemParamConfigRequest.getPage() - 1) * SystemParamConfigRequest.getLimit(); + PageHelper.offsetPage(offset, SystemParamConfigRequest.getLimit()); + } List list = systemParamConfigDao.queryPage(SystemParamConfigRequest); return list; } @@ -54,7 +57,7 @@ public class SystemParamConfigServiceImpl implements SystemParamConfigService { @Override public String selectValueByParamKey(String key) { SystemParamConfigEntity systemParamConfigEntity = systemParamConfigDao.selectByParamKey(key); - if(systemParamConfigEntity!=null ){ + if (systemParamConfigEntity != null) { return systemParamConfigEntity.getParamValue(); } return null; diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml index 0aff91e..26edb6c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml @@ -272,6 +272,14 @@ allowNoProduct=#{allowNoProduct}, spmc=#{spmc}, cpdls=#{cpdls}, + basicPrductRemak1=#{basicPrductRemak1}, + basicPrductRemak2=#{basicPrductRemak2}, + basicPrductRemak3=#{basicPrductRemak3}, + basicPrductRemak4=#{basicPrductRemak4}, + basicPrductRemak5=#{basicPrductRemak5}, + basicPrductRemak6=#{basicPrductRemak6}, + basicPrductRemak7=#{basicPrductRemak7}, + basicPrductRemak8=#{basicPrductRemak8}, WHERE nameCode = #{nameCode} diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml index f61f959..8c483ea 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml @@ -291,7 +291,10 @@ stock_order_detail.expireDate, stock_order_detail.count, stock_order_detail.sweepCount, stock_order_detail.ylqxzcrbarmc,stock_order_detail.manufactory, stock_order_detail.zczbhhzbapzbh, stock_order_detail.price,inv_warehouse.name locInv,inv_warehouse_sub.name subInv,basic_products.spmc, - basic_products.cpms,basic_udirel.measname,auth_dept.`name` deptName + basic_products.cpms,basic_udirel.measname,auth_dept.`name` + deptName,basic_products.basicPrductRemak1 + ,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6 + ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8 FROM stock_order INNER JOIN stock_order_detail on stock_order.id = stock_order_detail.orderIdFk LEFT JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code` @@ -328,7 +331,9 @@ spec,io_codes.batchNo,io_codes.produceDate productDate,io_codes.expireDate ,io_codes.serialNo,io_codes.count, basic_products.ylqxzcrbarmc,basic_udirel.manufactory,basic_udirel.measname,basic_products.zczbhhzbapzbh, inv_warehouse.name locInv, inv_warehouse_sub.name subInv, basic_products.spmc, - basic_products.cpms,io_codes.nameCode,io_codes.relId + basic_products.cpms,io_codes.nameCode,io_codes.relId,basic_products.basicPrductRemak1 + ,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6 + ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8 from io_codes INNER JOIN basic_udirel on io_codes.relId = basic_udirel.id INNER JOIN basic_products on basic_products.uuid = basic_udirel.uuid @@ -377,7 +382,9 @@ \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/param/SystemParamConfigDao.xml b/api-admin/src/main/resources/mybatis/mapper/param/SystemParamConfigDao.xml index b3ab279..edf09b3 100644 --- a/api-admin/src/main/resources/mybatis/mapper/param/SystemParamConfigDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/param/SystemParamConfigDao.xml @@ -5,31 +5,41 @@ @@ -54,17 +64,14 @@ - insert INTO system_param_config(paramName, - paramKey,paramValue,paramStatus,paramType,paramExplain - ) values - ( - #{paramName}, - #{paramKey}, - #{paramValue}, - #{paramStatus}, - #{paramType}, - #{paramExplain} - ) + insert INTO system_param_config(paramName, + paramKey, paramValue, paramStatus, paramType, paramExplain) + values (#{paramName}, + #{paramKey}, + #{paramValue}, + #{paramStatus}, + #{paramType}, + #{paramExplain})