yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_java

This commit is contained in:
1378012178@qq.com 2025-10-15 16:38:18 +08:00
parent 2fef9af949 5cb1d2bd9c
commit 033e582560
6 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
View File

@ -230,8 +230,8 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
info.setWlMaterialNo(ConfigMaterialInfo.getMaterialNo());
info.setWlSpecificationModel(ConfigMaterialInfo.getSpecificationModel());
info.setWlUnits(ConfigMaterialInfo.getMaterialUnits());
info.setWlUpperLimit(warehouseMaterialInfo.getUpperLimit());
info.setWlLowerLimit(warehouseMaterialInfo.getLowerLimit());
info.setWlUpperLimit(ConfigMaterialInfo.getUpperLimit());
info.setWlLowerLimit(ConfigMaterialInfo.getLowerLimit());
if(StringUtils.equals("1",ConfigMaterialInfo.getMultiUnitType())){
info.setReferenceUnitPrice(ConfigMaterialInfo.getOneUnitPrice()+"");
}else if(StringUtils.equals("2",ConfigMaterialInfo.getMultiUnitType())){

4
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java
View File

@ -79,8 +79,8 @@ public class QgdInfoServiceImpl extends ServiceImpl<QgdInfoMapper, QgdInfo> impl
info.setWlMaterialNo(ConfigMaterialInfo.getMaterialNo());
info.setWlSpecificationModel(ConfigMaterialInfo.getSpecificationModel());
info.setWlUnits(ConfigMaterialInfo.getMaterialUnits());
info.setWlUpperLimit(warehouseMaterialInfo.getUpperLimit());
info.setWlLowerLimit(warehouseMaterialInfo.getLowerLimit());
info.setWlUpperLimit(ConfigMaterialInfo.getUpperLimit());
info.setWlLowerLimit(ConfigMaterialInfo.getLowerLimit());
if(StringUtils.equals("1",ConfigMaterialInfo.getMultiUnitType())){
info.setReferenceUnitPrice(ConfigMaterialInfo.getOneUnitPrice()+"");
}else if(StringUtils.equals("2",ConfigMaterialInfo.getMultiUnitType())){

4
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java
View File

@ -98,8 +98,8 @@ public class BlWarehouseMaterialInfoController extends JeecgController<BlWarehou
BlWarehouseMaterialInfo blWarehouseMaterialInfo1 = new BlWarehouseMaterialInfo();
blWarehouseMaterialInfo1.setNuId(blWarehouseMaterialInfo.getNuId());
blWarehouseMaterialInfo1.setWlId(wlId);
blWarehouseMaterialInfo1.setUpperLimit(blWarehouseMaterialInfo.getUpperLimit());
blWarehouseMaterialInfo1.setLowerLimit(blWarehouseMaterialInfo.getLowerLimit());
// blWarehouseMaterialInfo1.setUpperLimit(blWarehouseMaterialInfo.getUpperLimit());
// blWarehouseMaterialInfo1.setLowerLimit(blWarehouseMaterialInfo.getLowerLimit());
blWarehouseMaterialInfoService.save(blWarehouseMaterialInfo1);
}
}

17
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/entity/BlWarehouseMaterialInfo.java
View File

@ -67,14 +67,7 @@ public class BlWarehouseMaterialInfo implements Serializable {
@Dict(dictTable = "nu_config_material_info", dicText = "material_name", dicCode = "id")
@ApiModelProperty(value = "物料")
private java.lang.String wlId;
/**物料上限*/
@Excel(name = "物料上限", width = 15)
@ApiModelProperty(value = "物料上限")
private java.lang.String upperLimit;
/**物料下限*/
@Excel(name = "物料下限", width = 15)
@ApiModelProperty(value = "物料下限")
private java.lang.String lowerLimit;
/**库存数量*/
@Excel(name = "库存数量", width = 15)
@ApiModelProperty(value = "库存数量")
@ -170,6 +163,14 @@ public class BlWarehouseMaterialInfo implements Serializable {
@ApiModelProperty(value = "多单位采购默认使用 0子集 1父级 2爷级")
private java.lang.String multiUnitType;
/**物料上限*/
@TableField(exist = false)
@ApiModelProperty(value = "物料上限")
private java.lang.String upperLimit;
/**物料下限*/
@TableField(exist = false)
@ApiModelProperty(value = "物料下限")
private java.lang.String lowerLimit;
@TableField(exist = false)
private java.lang.String wlParamInfo;//查询物料信息参数，可多个查询

7
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml
View File

@ -22,9 +22,10 @@
b.two_unit,
b.two_unit_proportion,
b.two_unit_price,
b.multi_unit_type
from nu_warehouse_material_info a
b.multi_unit_type,
b.upper_limit,
b.lower_limit
from nu_warehouse_material_info a
left join nu_config_material_info b on a.wl_id = b.id
) a
${ew.customSqlSegment}

9
nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java
View File

@ -130,6 +130,15 @@ public class NuBaseInfo implements Serializable {
@ApiModelProperty(value = "是否已同步0已同步 1未同步")
private java.lang.String izSync;
@ApiModelProperty(value = "负责人")
private java.lang.String fzr;
@ApiModelProperty(value = "负责人电话")
private java.lang.String fzrTel;
@ApiModelProperty(value = "负责人头像")
private java.lang.String fzrHeadPath;
@TableField(exist = false)
private String deviceId;//摄像头 ID
@TableField(exist = false)