From d6f9e3f06a25a356ebab01077287ff33b786f722 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 4 Jul 2023 17:54:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E4=BD=BF=E7=94=A8=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=96=B0=E5=A2=9E=E5=A4=87=E6=B3=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sync/SpsSyncDownloadController.java | 5 +++++ .../com/glxp/api/entity/inout/IoOrderEntity.java | 14 +++++++++++++- src/main/resources/schemas/schema_v2.1.sql | 5 +++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index d0207690..db8474ff 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -667,6 +667,11 @@ public class SpsSyncDownloadController { InvWarehouseEntity parentInv = invWarehouseService.findOneLevel(invWarehouseEntity.getParentCode()); if (parentInv == null) parentInv = invWarehouseEntity; + + orderEntity.setRmFromCorp(orderEntity.getFromCorp()); + orderEntity.setRmDeptCode(orderEntity.getDeptCode()); + orderEntity.setRmInvCode(orderEntity.getInvCode()); + orderEntity.setInvCode(parentInv.getCode()); orderEntity.setDeptCode(parentInv.getParentId()); orderEntity.setFromCorp("科室使用出库"); diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java index b8fbae06..f5c38ba8 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java @@ -243,7 +243,7 @@ public class IoOrderEntity { @TableField(value = "checkPreInOrders") private String checkPreInOrders; - + // 预验收按货位出库，退货 @TableField(value = "checkPreInInvCode") private String checkPreInInvCode; @@ -252,4 +252,16 @@ public class IoOrderEntity { @TableField(value = "checkPreInSpaceCode") private String checkPreInSpaceCode; + + // 使用出库单备注字段 + //备注往来单位（病人信息） + @TableField(value = "rmFromCorp") + private String rmFromCorp; + //备注部门 + @TableField(value = "rmDeptCode") + private String rmDeptCode; + //备注仓库号 + @TableField(value = "rmInvCode") + private String rmInvCode; + } diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 11c0f33e..537cfab9 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -431,3 +431,8 @@ INSERT ignore INTO `sys_param_config`(id, `parentId`, `paramName`, `paramKey`, ` `paramType`, `paramExplain`, `updateTime`) VALUES (20059, 0, '是否允许编辑第三方产品信息', 'enable_edit_third', '1', 0, 0, '0：否；1：是', NULL); + + +CALL Pro_Temp_ColumnWork('io_order', 'rmFromCorp', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('io_order', 'rmDeptCode', 'varchar(255)', 1); +CALL Pro_Temp_ColumnWork('io_order', 'rmInvCode', 'varchar(255)', 1);