UDI
/
spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

动态添加产品信息参数信息

Browse Source
zhairh
anthonyywj2 3 years ago
parent f314bb1e7f
commit 630faad352
10 changed files with 146 additions and 22 deletions
Show Stats Download Patch File Download Diff File

33
api-admin/src/main/java/com/glxp/sale/admin/controller/param/SystemParamConfigController.java
Unescape Escape View File

@ -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<SystemParamConfigEntity> 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);
}
}

10
api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java
Unescape Escape View File

@ -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;
}

11
api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java
Unescape Escape View File

@ -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;
}

34
api-admin/src/main/java/com/glxp/sale/admin/entity/param/ProductRemarkSetEntity.java
Unescape Escape View File

@ -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;
}

2
api-admin/src/main/java/com/glxp/sale/admin/req/param/SystemParamConfigRequest.java
Unescape Escape View File

@ -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;
}

11
api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java
Unescape Escape View File

@ -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;

9
api-admin/src/main/java/com/glxp/sale/admin/service/param/impl/SystemParamConfigServiceImpl.java
Unescape Escape View File

@ -18,8 +18,11 @@ public class SystemParamConfigServiceImpl implements SystemParamConfigService {
@Override
public List<SystemParamConfigEntity> 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<SystemParamConfigEntity> 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;

8
api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml
Unescape Escape View File

@ -272,6 +272,14 @@
<if test="allowNoProduct != null">allowNoProduct=#{allowNoProduct},</if>
<if test="spmc != null">spmc=#{spmc},</if>
<if test="cpdls != null">cpdls=#{cpdls},</if>
<if test="basicPrductRemak1 != null">basicPrductRemak1=#{basicPrductRemak1},</if>
<if test="basicPrductRemak2 != null">basicPrductRemak2=#{basicPrductRemak2},</if>
<if test="basicPrductRemak3 != null">basicPrductRemak3=#{basicPrductRemak3},</if>
<if test="basicPrductRemak4 != null">basicPrductRemak4=#{basicPrductRemak4},</if>
<if test="basicPrductRemak5 != null">basicPrductRemak5=#{basicPrductRemak5},</if>
<if test="basicPrductRemak6 != null">basicPrductRemak6=#{basicPrductRemak6},</if>
<if test="basicPrductRemak7 != null">basicPrductRemak7=#{basicPrductRemak7},</if>
<if test="basicPrductRemak8 != null">basicPrductRemak8=#{basicPrductRemak8},</if>
</trim>
WHERE nameCode = #{nameCode}
</update>

13
api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
Unescape Escape View File

@ -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 @@
</select>
<select id="selectByBillNo" resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
select * from stock_order where billNo = #{billNo}
select *
from stock_order
where billNo = #{billNo}
</select>
</mapper>

37
api-admin/src/main/resources/mybatis/mapper/param/SystemParamConfigDao.xml
Unescape Escape View File

@ -5,31 +5,41 @@
<select id="queryPage" parameterType="com.glxp.sale.admin.req.param.SystemParamConfigRequest"
resultType="com.glxp.sale.admin.entity.param.SystemParamConfigEntity">
SELECT id,paramName,paramKey,paramValue,paramStatus,paramType,paramExplain
SELECT *
FROM system_param_config
<where>
AND `paramStatus` = #{paramStatus}
<if test="paramName != null and '' != paramName">
AND `paramName` LIKE CONCAT(#{paramName},'%')
</if>
<if test="paramType!=null">
and paramType = #{paramType}
</if>
</where>
order BY id
</select>
<select id="findSystemParamConfig" parameterType="com.glxp.sale.admin.req.param.SystemParamConfigRequest"
resultType="com.glxp.sale.admin.entity.param.SystemParamConfigEntity">
SELECT * FROM system_param_config WHERE id=#{id}
SELECT *
FROM system_param_config
WHERE id = #{id}
</select>
<select id="selectByParamName" parameterType="com.glxp.sale.admin.req.param.SystemParamConfigRequest"
resultType="com.glxp.sale.admin.entity.param.SystemParamConfigEntity">
SELECT * FROM system_param_config WHERE paramName=#{paramName}
SELECT *
FROM system_param_config
WHERE paramName = #{paramName}
</select>
<select id="selectByParamKey" parameterType="com.glxp.sale.admin.req.param.SystemParamConfigRequest"
resultType="com.glxp.sale.admin.entity.param.SystemParamConfigEntity">
SELECT * FROM system_param_config WHERE paramKey=#{paramKey}
SELECT *
FROM system_param_config
WHERE paramKey = #{paramKey}
</select>
<update id="updateById" parameterType="com.glxp.sale.admin.entity.param.SystemParamConfigEntity">
@ -54,17 +64,14 @@
</update>
<insert id="insert" parameterType="com.glxp.sale.admin.entity.param.SystemParamConfigEntity">
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})
</insert>

Write Preview
Loading…
Cancel
Save