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

修改bug

This commit is contained in:
yangjun 2025-12-08 08:59:21 +08:00
parent 936b4ebea8
commit 1a421b5e80
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuWarehouseMaterialCrkInfo.java
View File

@ -94,6 +94,8 @@ public class NuWarehouseMaterialCrkInfo implements Serializable {
@Dict(dicCode = "crk_status") @Dict(dicCode = "crk_status")
private String crkStatus; private String crkStatus;
private Integer ddwNum;//多单位时的数量
@TableField(exist = false) @TableField(exist = false)
private String paramDate; private String paramDate;
} }

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

@ -1059,6 +1059,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
crkInfo.setOldPrice(procurementPrice);//原来的价格（最开始的采购价格） crkInfo.setOldPrice(procurementPrice);//原来的价格（最开始的采购价格）
crkInfo.setNewPrice(price);//新的价格 crkInfo.setNewPrice(price);//新的价格
crkInfo.setCzqkcl(kcsl);//操作前库存量 crkInfo.setCzqkcl(kcsl);//操作前库存量
crkInfo.setDdwNum(jhNum);//多单位时的数量
String dqkcl = kcsl; String dqkcl = kcsl;
if(jhNum > cgsl - rksl - xzsl){ if(jhNum > cgsl - rksl - xzsl){
@ -1082,7 +1083,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
} }
crkInfo.setDqkcl(dqkcl);//当前库存量(操作后的库存量) crkInfo.setDqkcl(dqkcl);//当前库存量(操作后的库存量)
crkInfo.setContent("采购单："+cgdMain.getCgdNo()); crkInfo.setContent("采购单："+cgdMain.getCgdNo());
if(crkInfo.getCrkNum()>0 && StringUtils.equals("0",jhType)){ if(crkInfo.getCrkNum()>0){
crkInfoMapper.insert(crkInfo); crkInfoMapper.insert(crkInfo);
} }
@ -1154,7 +1155,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
//计算一下采购单的实际进货价格 //计算一下采购单的实际进货价格
BigDecimal zjhjg = new BigDecimal("0"); BigDecimal zjhjg = new BigDecimal("0");
for (NuWarehouseMaterialCrkInfo info : crkInfoList){ for (NuWarehouseMaterialCrkInfo info : crkInfoList){
zjhjg = zjhjg.add(info.getNewPrice().multiply(new BigDecimal(info.getCrkNum()))); zjhjg = zjhjg.add(info.getNewPrice().multiply(new BigDecimal(info.getDdwNum())));
} }
cgdMain.setTotalPrice(zjhjg); cgdMain.setTotalPrice(zjhjg);

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

@ -208,4 +208,6 @@ public class BlWarehouseMaterialInfo implements Serializable {
private Integer gwcNum;//购物车的采购数量 private Integer gwcNum;//购物车的采购数量
@TableField(exist = false) @TableField(exist = false)
private Integer ljkcsl;//累计库存数量 private Integer ljkcsl;//累计库存数量
@TableField(exist = false)
private String nuName;//累计库存数量
} }

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

@ -30,11 +30,13 @@
b.reference_unit_price, b.reference_unit_price,
b.material_img, b.material_img,
c.item_text as tagName, c.item_text as tagName,
if(d.wl_id is null, '0', '1') as isAdd if(d.wl_id is null, '0', '1') as isAdd,
kf.nu_name
from nu_warehouse_material_info a from nu_warehouse_material_info a
left join nu_config_material_info b on a.wl_id = b.id 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 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 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
) a ) a
${ew.customSqlSegment} ${ew.customSqlSegment}