From e893990460114924d7012e478a41e2834d5e92da Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Fri, 5 Dec 2025 15:27:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E9=A2=86=E5=8D=95-=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=A2=9E=E5=8A=A0=E6=8A=A4=E7=90=86=E5=8D=95?= =?UTF-8?q?=E5=85=83/=E5=BA=93=E6=88=BF=E5=87=BA=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=9A=84=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=20=E9=80=80=E8=B4=A7-=E5=85=A5=E5=BA=93=E6=97=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=8A=A4=E7=90=86=E5=8D=95=E5=85=83/=E5=BA=93?= =?UTF-8?q?=E6=88=BF=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95=E7=9A=84?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nu/modules/nu/entity/NuInvoicingNuCrkLog.java | 4 ++++ .../com/nu/modules/qld/service/impl/QingLingServiceImpl.java | 2 ++ .../java/com/nu/modules/thd/service/impl/ThdServiceImpl.java | 2 ++ 3 files changed, 8 insertions(+) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/entity/NuInvoicingNuCrkLog.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/entity/NuInvoicingNuCrkLog.java index aa64337..e37310d 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/entity/NuInvoicingNuCrkLog.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/entity/NuInvoicingNuCrkLog.java @@ -78,4 +78,8 @@ public class NuInvoicingNuCrkLog implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "createTime") private java.util.Date createTime; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private java.lang.String content; } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java index 0c32e34..f8e589c 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java @@ -618,6 +618,7 @@ public class QingLingServiceImpl implements IQinglingApi { nuInvoicingNuCrkLog.setType("1");//类型 1请领 nuInvoicingNuCrkLog.setOrderNumber(item.getQldNo());//单号 nuInvoicingNuCrkLog.setOrderType("qld");//单子类型： qld请领单 + nuInvoicingNuCrkLog.setContent("请领单：" + item.getQldNo());//备注 nuCrkLogList.add(nuInvoicingNuCrkLog); }); invoicingNuCrkLogService.saveBatch(nuCrkLogList); @@ -703,6 +704,7 @@ public class QingLingServiceImpl implements IQinglingApi { kfCrkLog.setCzqkcl(kfWlSlMap.get(item.getKfId()).get(item.getWlId()));//操作前库存量 kfCrkLog.setDqkcl((Integer.parseInt(kfWlSlMap.get(item.getKfId()).get(item.getWlId())) - item.getQlNum()) + "");//当前库存量 kfCrkLog.setCrkStatus("3");//出入库状态 3出库 + kfCrkLog.setContent("请领单：" + dto.getQldNo());//备注 kfCrkLogList.add(kfCrkLog); }); warehouseMaterialCrkInfoService.saveBatch(kfCrkLogList); diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java index 198a88c..3623f1e 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java @@ -372,6 +372,7 @@ public class ThdServiceImpl implements ITuiHuoApi { kfCrkLog.setCzqkcl(kfWlSlMap.get(item.getKfId()).get(item.getWlId()));//操作前库存量 kfCrkLog.setDqkcl((Integer.parseInt(kfWlSlMap.get(item.getKfId()).get(item.getWlId())) + item.getThNum()) + "");//当前库存量 kfCrkLog.setCrkStatus("1");//出入库状态 1入库 + kfCrkLog.setContent("退货单：" + thdNo);//备注 kfCrkLogList.add(kfCrkLog); } warehouseMaterialCrkInfoService.saveBatch(kfCrkLogList); @@ -401,6 +402,7 @@ public class ThdServiceImpl implements ITuiHuoApi { nuInvoicingNuCrkLog.setType("2");//类型 2退货 nuInvoicingNuCrkLog.setOrderNumber(item.getThdNo());//单号 nuInvoicingNuCrkLog.setOrderType("thd");//单子类型： thd退货单 + nuInvoicingNuCrkLog.setContent("退货单：" + item.getThdNo());//备注 nuCrkLogList.add(nuInvoicingNuCrkLog); }); invoicingNuCrkLogService.saveBatch(nuCrkLogList);