去掉无用的字段
This commit is contained in:
parent
fa99052078
commit
9c38e80a86
|
|
@ -148,7 +148,6 @@ public class ConfigMaterialInfoController extends JeecgController<ConfigMaterial
|
|||
String firstLetter = PinyinUtils.getFirstLetter(chinese);
|
||||
configMaterialInfo.setPinyin(firstLetter);
|
||||
}
|
||||
configMaterialInfoService.updateOneTwoPrice(configMaterialInfo);
|
||||
configMaterialInfoService.updateById(configMaterialInfo);
|
||||
return Result.OK("操作成功!");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,43 +71,6 @@ public class ConfigMaterialInfo implements Serializable {
|
|||
@Excel(name = "生产厂家", width = 15)
|
||||
@ApiModelProperty(value = "生产厂家")
|
||||
private String manufacturer;
|
||||
/**销售单价*/
|
||||
@ApiModelProperty(value = "销售单价")
|
||||
private java.math.BigDecimal salesUnitPrice;
|
||||
/**参考单价*/
|
||||
@ApiModelProperty(value = "参考单价")
|
||||
private java.math.BigDecimal referenceUnitPrice;
|
||||
/**货品单位*/
|
||||
@ApiModelProperty(value = "货品单位")
|
||||
private java.lang.String materialUnits;
|
||||
/**多单位开关 0关 1开*/
|
||||
@ApiModelProperty(value = "多单位开关 0关 1开")
|
||||
private java.lang.String multiUnitSwitch;
|
||||
/**父级单位*/
|
||||
@ApiModelProperty(value = "父级单位")
|
||||
private java.lang.String oneUnit;
|
||||
/**父级单位兑换比例*/
|
||||
@ApiModelProperty(value = "父级单位兑换比例")
|
||||
private java.lang.Integer oneUnitProportion;
|
||||
/**父级单位价格*/
|
||||
@ApiModelProperty(value = "父级单位价格")
|
||||
private java.math.BigDecimal oneUnitPrice;
|
||||
/**爷级单位*/
|
||||
@ApiModelProperty(value = "爷级单位")
|
||||
private java.lang.String twoUnit;
|
||||
/**爷级单位兑换比例*/
|
||||
@ApiModelProperty(value = "爷级单位兑换比例")
|
||||
private java.lang.Integer twoUnitProportion;
|
||||
/**爷级单位价格*/
|
||||
@ApiModelProperty(value = "爷级单位价格")
|
||||
private java.math.BigDecimal twoUnitPrice;
|
||||
/**多单位采购默认使用 0子集 1父级 2爷级*/
|
||||
@ApiModelProperty(value = "多单位采购默认使用 0子集 1父级 2爷级")
|
||||
private java.lang.String multiUnitType;
|
||||
/**供应商*/
|
||||
@ApiModelProperty(value = "供应商")
|
||||
@Dict(dictTable = "nu_config_suppliers_info" , dicCode = "id" , dicText = "suppliers_name")
|
||||
private java.lang.String suppliers;
|
||||
/**物料图片*/
|
||||
@ApiModelProperty(value = "物料图片")
|
||||
private java.lang.String materialImg;
|
||||
|
|
@ -143,39 +106,22 @@ public class ConfigMaterialInfo implements Serializable {
|
|||
private java.lang.String sysOrgCode;
|
||||
/**拼音*/
|
||||
private java.lang.String pinyin;
|
||||
/**物料上限*/
|
||||
private java.lang.String upperLimit;
|
||||
/**物料下县*/
|
||||
private java.lang.String lowerLimit;
|
||||
/**物料标签*/
|
||||
@Dict(dicCode = "wl_tag_type")
|
||||
private String tagType;
|
||||
|
||||
/**是否医保报销 0否 1是*/
|
||||
@Dict(dicCode = "yn")
|
||||
private java.lang.String izYbbx;
|
||||
/**是否机构优惠 0否 1是*/
|
||||
@Dict(dicCode = "yn")
|
||||
private java.lang.String izJgyh;
|
||||
|
||||
@TableField(exist = false)
|
||||
private java.lang.String izYbbxName;
|
||||
@TableField(exist = false)
|
||||
private java.lang.String izJgyhName;
|
||||
@TableField(exist = false)
|
||||
private java.lang.String izEnabledName;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String treeId;//树id,用于查询
|
||||
|
||||
@TableField(exist = false)
|
||||
private String kcsl;//库存数量
|
||||
|
||||
@TableField(exist = false)
|
||||
private String checkId;//当前选择的物料id,主要用于物料分配的时候当前选择的物料
|
||||
|
||||
@TableField(exist = false)
|
||||
private String paramWlxx;//选择物料的时候物料查询信息
|
||||
|
||||
@TableField(exist = false)
|
||||
private String categoryName;
|
||||
@TableField(exist = false)
|
||||
|
|
@ -184,13 +130,13 @@ public class ConfigMaterialInfo implements Serializable {
|
|||
private String medicationName;
|
||||
@TableField(exist = false)
|
||||
private String tagName;
|
||||
|
||||
//综合搜索
|
||||
@TableField(exist = false)
|
||||
private String keyWord;
|
||||
@TableField(exist = false)
|
||||
private String suppliers;
|
||||
@TableField(exist = false)
|
||||
private String suppliersName;
|
||||
|
||||
@TableField(exist = false)
|
||||
private Integer wlNum;//累计入库物料数量
|
||||
@TableField(exist = false)
|
||||
|
|
|
|||
|
|
@ -22,10 +22,6 @@ import java.util.Date;
|
|||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("nu_config_material_info")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="config_material_info对象", description="物料信息")
|
||||
public class ConfigMaterialInfoImportEntity implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,10 +22,6 @@ import java.util.Date;
|
|||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("nu_config_material_info")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="config_material_info对象", description="物料分类")
|
||||
public class ConfigMaterialTypeImportEntity implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ public interface ConfigMaterialInfoMapper extends BaseMapper<ConfigMaterialInfo>
|
|||
|
||||
ConfigMaterialInfo queryMaterialInfo(InvoicingQldQueryEntity queryDto);
|
||||
|
||||
void updateOneTwoPrice(@Param("params") ConfigMaterialInfo configMaterialInfo);
|
||||
|
||||
List<ConfigMaterialInfo> queryByWlids(@Param("ids") List<String> ids);
|
||||
|
||||
|
|
|
|||
|
|
@ -115,18 +115,6 @@
|
|||
where info.id = #{wlId}
|
||||
</select>
|
||||
|
||||
|
||||
<update id="updateOneTwoPrice">
|
||||
update nu_config_material_info
|
||||
set one_unit = #{params.oneUnit},
|
||||
one_unit_proportion = #{params.oneUnitProportion},
|
||||
one_unit_price = #{params.oneUnitPrice},
|
||||
two_unit = #{params.twoUnit},
|
||||
two_unit_proportion = #{params.twoUnitProportion},
|
||||
two_unit_price = #{params.twoUnitPrice}
|
||||
where id = #{params.id}
|
||||
</update>
|
||||
|
||||
<select id="queryByWlids" resultType="com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo">
|
||||
select a.*,f.category_name,g.type_name,h.medication_name
|
||||
from nu_config_material_info a
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ public interface IConfigMaterialInfoService extends IService<ConfigMaterialInfo>
|
|||
|
||||
IPage<ConfigMaterialInfo> getConfiguredList(Page<ConfigMaterialInfo> page, ConfigMaterialInfo configMaterialInfo);
|
||||
|
||||
void updateOneTwoPrice(ConfigMaterialInfo configMaterialInfo);
|
||||
|
||||
Result<?> importMateriallInfo(HttpServletRequest request);
|
||||
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl<ConfigMateria
|
|||
infoMap.put("izEnabled",par.getIzEnabled());
|
||||
infoMap.put("children",wllxMap2List);
|
||||
infoMap.put("categoryId",par.getId());
|
||||
infoMap.put("parentIzEnabled","N");
|
||||
infoMap.put("parentIzEnabled","Y");
|
||||
infoMap.put("appIconPath",par.getAppIconPath());
|
||||
infoMap.put("appCheckIconPath",par.getAppCheckIconPath());
|
||||
infoMap.put("icon",par.getIcon());
|
||||
|
|
|
|||
|
|
@ -70,10 +70,6 @@ public class ConfigMaterialInfoServiceImpl extends ServiceImpl<ConfigMaterialInf
|
|||
return baseMapper.getConfiguredList(page, configMaterialInfo);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateOneTwoPrice(ConfigMaterialInfo configMaterialInfo) {
|
||||
baseMapper.updateOneTwoPrice(configMaterialInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 一级没有的话直接新增
|
||||
|
|
@ -518,7 +514,6 @@ public class ConfigMaterialInfoServiceImpl extends ServiceImpl<ConfigMaterialInf
|
|||
String materialName, String materialNo, String specificationModel, int rowNum) {
|
||||
boolean hasCategory = categoryName != null && !categoryName.trim().isEmpty();
|
||||
boolean hasType = typeName != null && !typeName.trim().isEmpty();
|
||||
boolean hasMedication = medicationName != null && !medicationName.trim().isEmpty();
|
||||
boolean hasMaterialName = materialName != null && !materialName.trim().isEmpty();
|
||||
boolean hasMaterialNo = materialNo != null && !materialNo.trim().isEmpty();
|
||||
boolean hasSpecificationModel = specificationModel != null && !specificationModel.trim().isEmpty();
|
||||
|
|
@ -533,11 +528,6 @@ public class ConfigMaterialInfoServiceImpl extends ServiceImpl<ConfigMaterialInf
|
|||
return String.format("第%d行:缺少二级分类", rowNum);
|
||||
}
|
||||
|
||||
// 必须有三级分类
|
||||
if (!hasMedication) {
|
||||
return String.format("第%d行:缺少三级分类", rowNum);
|
||||
}
|
||||
|
||||
// 物料名称必须有值
|
||||
if (!hasMaterialName) {
|
||||
return String.format("第%d行:缺少物料名称", rowNum);
|
||||
|
|
|
|||
|
|
@ -234,35 +234,10 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
|
|||
break;
|
||||
}
|
||||
|
||||
if(!StringUtils.equals(qgdInfoEntity.getWlUnits(),configMaterialInfo.getMaterialUnits()) && !StringUtils.equals(qgdInfoEntity.getWlUnits(),configMaterialInfo.getOneUnit()) && !StringUtils.equals(qgdInfoEntity.getWlUnits(),configMaterialInfo.getTwoUnit())){
|
||||
errorMessage = "采购单位不一致,请移除【"+qgdInfoEntity.getWlName()+"】采购单位为【"+qgdInfoEntity.getWlUnits()+"】这个物料后重新采购!";
|
||||
break;
|
||||
}
|
||||
|
||||
if(!StringUtils.equals(qgdInfoEntity.getWlSpecificationModel(),configMaterialInfo.getSpecificationModel())){
|
||||
errorMessage = "规格型号不一致,请移除【"+qgdInfoEntity.getWlName()+"】规格型号为【"+qgdInfoEntity.getWlSpecificationModel()+"】这个物料后重新采购!";
|
||||
break;
|
||||
}
|
||||
String price = String.format("%.2f",configMaterialInfo.getReferenceUnitPrice());
|
||||
String oneprice = String.format("%.2f",configMaterialInfo.getOneUnitPrice());
|
||||
String twoprice = String.format("%.2f",configMaterialInfo.getTwoUnitPrice());
|
||||
String cgdj = String.format("%.2f",qgdInfoEntity.getReferenceUnitPrice());
|
||||
if(StringUtils.equals(cgdj,price) || StringUtils.equals(cgdj,oneprice) || StringUtils.equals(cgdj,twoprice)){
|
||||
//如果有一个相等了,就代表是正确的
|
||||
//一个都没有相等,则说明是错误的
|
||||
}else{
|
||||
errorMessage = "采购单价不一致,请移除【"+qgdInfoEntity.getWlName()+"】采购单价为【"+qgdInfoEntity.getReferenceUnitPrice()+"】这个物料后重新采购!";
|
||||
break;
|
||||
}
|
||||
|
||||
if(!StringUtils.equals(qgdInfoEntity.getWlUpperLimit(),configMaterialInfo.getUpperLimit())){
|
||||
errorMessage = "物料上限不一致,请移除【"+qgdInfoEntity.getWlName()+"】物料上限为【"+qgdInfoEntity.getWlUpperLimit()+"】这个物料后重新采购!";
|
||||
break;
|
||||
}
|
||||
if(!StringUtils.equals(qgdInfoEntity.getWlLowerLimit(),configMaterialInfo.getLowerLimit())){
|
||||
errorMessage = "物料下限不一致,请移除【"+qgdInfoEntity.getWlName()+"】物料下限为【"+qgdInfoEntity.getWlLowerLimit()+"】这个物料后重新采购!";
|
||||
break;
|
||||
}
|
||||
|
||||
wlIdList.add(qgdInfoEntity.getWlId());
|
||||
String suppliersId = qgdInfoEntity.getSuppliersId();
|
||||
|
|
@ -1154,7 +1129,6 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
|
|||
crkInfo.setMaterialTypeName(dictUtils.translateDictValue("id","type_name","nu_config_material_type",configMaterialInfo.getTypeId()));//物料类型名称
|
||||
crkInfo.setMaterialMedicationName(dictUtils.translateDictValue("id","medication_name","nu_config_material_medication",configMaterialInfo.getMedicationId()));//物料类型名称
|
||||
crkInfo.setMaterialName(configMaterialInfo.getMaterialName());//物料名称
|
||||
crkInfo.setMaterialUnits(configMaterialInfo.getMaterialUnits());//物料单位
|
||||
crkInfo.setMaterialNo(configMaterialInfo.getMaterialNo());//物料编码
|
||||
crkInfo.setSpecificationModel(configMaterialInfo.getSpecificationModel());//规格型号
|
||||
crkInfo.setMaterialImg(configMaterialInfo.getMaterialImg());//物料图片
|
||||
|
|
@ -1804,7 +1778,6 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
|
|||
pddInfo.setMaterialImg(configMaterialInfo.getMaterialImg());
|
||||
pddInfo.setMaterialName(configMaterialInfo.getMaterialName());
|
||||
pddInfo.setMaterialNo(configMaterialInfo.getMaterialNo());
|
||||
pddInfo.setMaterialUnits(configMaterialInfo.getMaterialUnits());
|
||||
pddInfo.setSpecificationModel(configMaterialInfo.getSpecificationModel());
|
||||
pddInfo.setCategoryName(configMaterialInfo.getCategoryName());
|
||||
pddInfo.setTypeName(configMaterialInfo.getTypeName());
|
||||
|
|
|
|||
|
|
@ -113,13 +113,6 @@ public class ConfigSuppliersInfoServiceImpl extends ServiceImpl<ConfigSuppliersI
|
|||
}
|
||||
}
|
||||
for(ConfigMaterialInfo wl : inList){
|
||||
String suppliers = wl.getSuppliers();
|
||||
if (StringUtils.isEmpty( suppliers)) {
|
||||
suppliers = configSuppliersInfo.getId();
|
||||
}else{
|
||||
suppliers = suppliers +","+configSuppliersInfo.getId();
|
||||
}
|
||||
wl.setSuppliers(suppliers);
|
||||
configMaterialInfoService.updateById(wl);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,16 +65,6 @@ public class QgdInfoServiceImpl extends ServiceImpl<QgdInfoMapper, QgdInfo> impl
|
|||
info.setWlName(ConfigMaterialInfo.getMaterialName());
|
||||
info.setWlMaterialNo(ConfigMaterialInfo.getMaterialNo());
|
||||
info.setWlSpecificationModel(ConfigMaterialInfo.getSpecificationModel());
|
||||
info.setWlUnits(ConfigMaterialInfo.getMaterialUnits());
|
||||
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())){
|
||||
info.setReferenceUnitPrice(ConfigMaterialInfo.getTwoUnitPrice());
|
||||
} else if(StringUtils.equals("3",ConfigMaterialInfo.getMultiUnitType())){
|
||||
info.setReferenceUnitPrice(ConfigMaterialInfo.getReferenceUnitPrice());
|
||||
}
|
||||
baseMapper.insert(info);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -446,11 +446,9 @@ public class QingLingServiceImpl implements IQinglingApi {
|
|||
item.setMaterialTypeName(maMap.get(item.getWlId()).getTypeName());//物料类型名称
|
||||
item.setMaterialMedicationName(maMap.get(item.getWlId()).getMedicationName());//物料类型名称
|
||||
item.setMaterialName(maMap.get(item.getWlId()).getMaterialName());//物料名称
|
||||
item.setMaterialUnits(maMap.get(item.getWlId()).getMaterialUnits());//物料单位
|
||||
item.setMaterialNo(maMap.get(item.getWlId()).getMaterialNo());//物料编码
|
||||
item.setSpecificationModel(maMap.get(item.getWlId()).getSpecificationModel());//规格型号
|
||||
item.setMaterialImg(maMap.get(item.getWlId()).getMaterialImg());//物料图片
|
||||
item.setSalesUnitPrice(maMap.get(item.getWlId()).getSalesUnitPrice());//物料销售单价
|
||||
});
|
||||
invoicingQldInfoService.saveBatch(infoList);
|
||||
|
||||
|
|
|
|||
|
|
@ -365,11 +365,9 @@ public class ThdServiceImpl implements ITuiHuoApi {
|
|||
info.setMaterialTypeName(maMap.get(gwc.getWlId()).getTypeName());//物料类型名称
|
||||
info.setMaterialMedicationName(maMap.get(gwc.getWlId()).getMedicationName());//物料类型名称
|
||||
info.setMaterialName(maMap.get(gwc.getWlId()).getMaterialName());//物料名称
|
||||
info.setMaterialUnits(maMap.get(gwc.getWlId()).getMaterialUnits());//物料单位
|
||||
info.setMaterialNo(maMap.get(gwc.getWlId()).getMaterialNo());//物料编码
|
||||
info.setSpecificationModel(maMap.get(gwc.getWlId()).getSpecificationModel());//规格型号
|
||||
info.setMaterialImg(maMap.get(gwc.getWlId()).getMaterialImg());//物料图片
|
||||
info.setSalesUnitPrice(maMap.get(gwc.getWlId()).getSalesUnitPrice());//物料销售单价
|
||||
infoList.add(info);
|
||||
}
|
||||
thdInfoService.saveBatch(infoList);
|
||||
|
|
|
|||
|
|
@ -4,86 +4,51 @@
|
|||
|
||||
<select id="selectList" resultType="com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo">
|
||||
select * from (
|
||||
select
|
||||
a.*,
|
||||
b.category_id,
|
||||
b.type_id,
|
||||
b.medication_id,
|
||||
b.material_name,
|
||||
b.pinyin,
|
||||
b.material_no,
|
||||
b.specification_model,
|
||||
b.suppliers,
|
||||
b.material_units,
|
||||
b.multi_unit_switch,
|
||||
b.one_unit,
|
||||
b.one_unit_proportion,
|
||||
b.one_unit_price,
|
||||
b.two_unit,
|
||||
b.two_unit_proportion,
|
||||
b.two_unit_price,
|
||||
b.multi_unit_type,
|
||||
b.upper_limit,
|
||||
b.lower_limit,
|
||||
b.tag_type,
|
||||
b.sales_unit_price,
|
||||
b.reference_unit_price,
|
||||
b.material_img,
|
||||
c.item_text as tagName,
|
||||
if(d.wl_id is null, '0', '1') as isAdd,
|
||||
kf.nu_name
|
||||
from nu_warehouse_material_info a
|
||||
left join nu_config_material_info b on a.wl_id = b.id
|
||||
left join (select nu_id,wl_id from nu_invoicing_qgd_info GROUP BY nu_id,wl_id) d on a.wl_id = d.wl_id
|
||||
left join sys_dict_item c on b.tag_type = c.item_value and c.dict_id = '1978662656563613698'
|
||||
left join nu_base_info kf on kf.nu_id = a.nu_id
|
||||
select
|
||||
a.*,
|
||||
b.category_id,
|
||||
b.type_id,
|
||||
b.medication_id,
|
||||
b.material_name,
|
||||
b.pinyin,
|
||||
b.material_no,
|
||||
b.specification_model,
|
||||
b.material_img,
|
||||
if(d.wl_id is null, '0', '1') as isAdd,
|
||||
kf.nu_name
|
||||
from nu_warehouse_material_info a
|
||||
left join nu_config_material_info b on a.wl_id = b.id
|
||||
left join (select nu_id,wl_id from nu_invoicing_qgd_info GROUP BY nu_id,wl_id) d on a.wl_id = d.wl_id
|
||||
left join nu_base_info kf on kf.nu_id = a.nu_id
|
||||
) a
|
||||
${ew.customSqlSegment}
|
||||
|
||||
</select>
|
||||
<select id="selectWaringList" resultType="com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo">
|
||||
select * from (
|
||||
select
|
||||
a.*,
|
||||
b.category_id,
|
||||
b.type_id,
|
||||
b.medication_id,
|
||||
b.material_name,
|
||||
b.pinyin,
|
||||
b.material_no,
|
||||
b.specification_model,
|
||||
b.suppliers,
|
||||
b.material_units,
|
||||
b.multi_unit_switch,
|
||||
b.one_unit,
|
||||
b.one_unit_proportion,
|
||||
b.one_unit_price,
|
||||
b.two_unit,
|
||||
b.two_unit_proportion,
|
||||
b.two_unit_price,
|
||||
b.multi_unit_type,
|
||||
b.upper_limit,
|
||||
b.lower_limit,
|
||||
b.tag_type,
|
||||
b.sales_unit_price,
|
||||
b.reference_unit_price,
|
||||
b.material_img,
|
||||
c.item_text as tagName,
|
||||
if(d.wl_id is null, '0', '1') as isAdd,
|
||||
cgd.cgzwlnum,
|
||||
e.purchase_quantity as gwcNum
|
||||
|
||||
from nu_warehouse_material_info a
|
||||
left join nu_config_material_info b on a.wl_id = b.id
|
||||
left join (select nu_id,wl_id from nu_invoicing_qgd_info GROUP BY nu_id,wl_id) d on a.wl_id = d.wl_id
|
||||
left join sys_dict_item c on b.tag_type = c.item_value and c.dict_id = '1978662656563613698'
|
||||
left join (select wl_id,sum(purchase_quantity) as purchase_quantity from nu_invoicing_qgd_info GROUP BY wl_id) e on a.wl_id = e.wl_id
|
||||
left join (
|
||||
select b.wl_id,sum(b.purchase_quantity) as cgzwlnum from nu_invoicing_cgd_main a,nu_invoicing_cgd_info b
|
||||
where a.id = b.cgd_id and a.cgd_type = '0' and a.status in (0,1)
|
||||
GROUP BY b.wl_id
|
||||
) cgd on a.wl_id = cgd.wl_id
|
||||
) a
|
||||
select
|
||||
a.*,
|
||||
b.category_id,
|
||||
b.type_id,
|
||||
b.medication_id,
|
||||
b.material_name,
|
||||
b.pinyin,
|
||||
b.material_no,
|
||||
b.specification_model,
|
||||
b.material_img,
|
||||
if(d.wl_id is null, '0', '1') as isAdd,
|
||||
cgd.cgzwlnum,
|
||||
e.purchase_quantity as gwcNum
|
||||
from nu_warehouse_material_info a
|
||||
left join nu_config_material_info b on a.wl_id = b.id
|
||||
left join (select nu_id,wl_id from nu_invoicing_qgd_info GROUP BY nu_id,wl_id) d on a.wl_id = d.wl_id
|
||||
left join (select wl_id,sum(purchase_quantity) as purchase_quantity from nu_invoicing_qgd_info GROUP BY wl_id) e on a.wl_id = e.wl_id
|
||||
left join (
|
||||
select b.wl_id,sum(b.purchase_quantity) as cgzwlnum from nu_invoicing_cgd_main a,nu_invoicing_cgd_info b
|
||||
where a.id = b.cgd_id and a.cgd_type = '0' and a.status in (0,1)
|
||||
GROUP BY b.wl_id
|
||||
) cgd on a.wl_id = cgd.wl_id
|
||||
) a
|
||||
${ew.customSqlSegment}
|
||||
|
||||
</select>
|
||||
|
|
|
|||
|
|
@ -313,7 +313,6 @@
|
|||
a.id,
|
||||
a.nu_id,
|
||||
c.nu_name,
|
||||
a.dimension,
|
||||
a.device_name,
|
||||
a.device_type,
|
||||
a.device_model,
|
||||
|
|
@ -364,7 +363,7 @@
|
|||
<if test="params.deviceStatus != null and params.deviceStatus != ''">
|
||||
AND t.online_status = #{params.deviceStatus}
|
||||
</if>
|
||||
order by a.dimension,a.device_type,a.device_model,a.sn
|
||||
order by a.device_type,a.device_model,a.sn
|
||||
</select>
|
||||
|
||||
<update id="release">
|
||||
|
|
|
|||
|
|
@ -123,11 +123,6 @@ public class NuBaseInfo implements Serializable {
|
|||
private java.lang.String sysOrgCode;
|
||||
@ApiModelProperty(value = "是否报警")
|
||||
private java.lang.String izWarning;
|
||||
/**
|
||||
* 是否已同步Y已同步 N未同步
|
||||
*/
|
||||
@ApiModelProperty(value = "是否已同步Y已同步 N未同步")
|
||||
private java.lang.String izSync;
|
||||
|
||||
@ApiModelProperty(value = "负责人")
|
||||
@Dict(dictTable = "nu_biz_employees_info",dicCode = "id",dicText = "name")
|
||||
|
|
@ -150,9 +145,6 @@ public class NuBaseInfo implements Serializable {
|
|||
* 是否绑定护理单元支付中 Y支付中(有客户正在给护理单元充值) N没有人在绑定缴费(可以让用户绑定)
|
||||
*/
|
||||
private String izBindPaying;
|
||||
private String izHldy;//是否是护理单元
|
||||
private String izKf;//是否是库房
|
||||
|
||||
|
||||
@TableField(exist = false)
|
||||
private String deviceId;//摄像头 ID
|
||||
|
|
|
|||
|
|
@ -108,7 +108,6 @@ public class NuBaseInfoServiceImpl extends ServiceImpl<NuBaseInfoMapper, NuBaseI
|
|||
@Override
|
||||
public void batchInsert(List<NuBaseInfo> syncList) {
|
||||
syncList.stream().forEach(bi -> {
|
||||
bi.setIzSync("0");
|
||||
baseMapper.insert(bi);
|
||||
});
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue