From eab899c4fe225961e5ccf43ea8db67af4efb4284 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 24 十月 2023 19:10:15 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/warehouse/PhiStockMoveItemDto.java | 21 ++++++++++
phis-feign/src/main/java/com/hz/his/dto/warehouse/PhiStockMoveDto.java | 51 +++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipWareHouseService.java | 21 ++++++++++
3 files changed, 93 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/warehouse/PhiStockMoveDto.java b/phis-feign/src/main/java/com/hz/his/dto/warehouse/PhiStockMoveDto.java
new file mode 100644
index 0000000..dc6ed73
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/warehouse/PhiStockMoveDto.java
@@ -0,0 +1,51 @@
+package com.hz.his.dto.warehouse;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 绉诲簱鍗曞弬鏁�
+ */
+@Data
+public class PhiStockMoveDto {
+
+ /**鏉ユ簮绫诲瀷:0涓烘不鐤楅�氱煡鍗曢鑽�*/
+ private Integer commonType;
+ /**鏉ユ簮鏍囪瘑*/
+ private String commonId;
+ /**鏉ユ簮缂栧彿*/
+ private String commonNo;
+
+ /**鍏宠仈绉诲簱鍗曟爣璇�*/
+ private String moveId;
+ /**鍏宠仈绉诲簱鍗曞崟鍙�*/
+ private String moveNo;
+
+ /**鎿嶄綔浜虹被鍨�(鍏蜂綋鐪嬪涓嬪父閲�)-蹇呭～*/
+ private Integer opType;
+ /**鎿嶄綔浜烘爣璇�*/
+ private String opId;
+ /**鎿嶄綔浜哄悕绉�*/
+ private String opName;
+ /**鎿嶄綔浜洪棬搴楁爣璇�*/
+ private String opShopId;
+ /**鎿嶄綔浜洪棬搴楀悕绉�*/
+ private String opShopName;
+ /**鎿嶄綔浜哄娉�*/
+ private String opRemark;
+
+ /**绉诲簱鍟嗗搧-蹇呭～*/
+ List<PhiStockMoveItemDto> itemDtoList;
+
+
+ /**鎿嶄綔浜虹被鍨�-绯荤粺*/
+ public static Integer OP_TYPE_SYS = 0;
+ /**鎿嶄綔浜虹被鍨�-鍛樺伐*/
+ public static Integer OP_TYPE_EMPLOYEE = 1;
+ /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛*/
+ public static Integer OP_TYPE_USER = 2;
+ /**鎿嶄綔浜虹被鍨�-绠＄悊鍛�*/
+ public static Integer OP_TYPE_ADMIN = 3;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/warehouse/PhiStockMoveItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/warehouse/PhiStockMoveItemDto.java
new file mode 100644
index 0000000..c181c40
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/warehouse/PhiStockMoveItemDto.java
@@ -0,0 +1,21 @@
+package com.hz.his.dto.warehouse;
+
+import lombok.Data;
+
+/**
+ * 绉诲簱鍗曞瓙椤�
+ */
+@Data
+public class PhiStockMoveItemDto {
+ /************************蹇呭～******************************/
+ /**绉诲姩搴撳瓨鏍囪瘑*/
+ private String sourceItemId;
+
+ /**绉诲姩鏁伴噺*/
+ private Integer num;
+
+ /**鐩爣浠撳簱鏍囪瘑*/
+ private String targetWarehouseId;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipWareHouseService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipWareHouseService.java
new file mode 100644
index 0000000..dd7eb3a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipWareHouseService.java
@@ -0,0 +1,21 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.warehouse.PhiStockMoveDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-warehouse")
+public interface SPhipWareHouseService {
+
+ /**
+ * 寮�鏀惧钩鍙拌浆鍙戝埌浠撳簱锛岀敓鎴愮Щ搴撳崟
+ */
+ @PostMapping(value = "/warehouse/order/create/move/stock")
+ Result moveStockOrder(@RequestBody PhiStockMoveDto phiStockMoveDto);
+
+}
\ No newline at end of file
--
Gitblit v1.8.0