From de7e73d0bcb3da5b42725c29a03b403eb0851f7f Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 11 十月 2022 15:27:26 +0800
Subject: [PATCH] 仓库模块
---
phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/vo/CommodityMessageVo.java | 7 -
phi-warehouse-feign/src/main/java/com/hx/phiappt/feign/WStcokService.java | 21 ++++
phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/order/stock/StockChangeDto.java | 82 ++++++++++++++++
phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/order/pick/PickUpDto.java | 53 ++++++++++
phi-warehouse-feign/src/main/java/com/hx/phiappt/feign/WOrderService.java | 34 ++++++
phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/stock/StockDto.java | 16 +++
phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/vo/ShopWarehouseMessageVo.java | 2
phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/order/stock/StockChangeItemDto.java | 17 +++
phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/vo/ERPInventoryVo.java | 2
phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/order/pick/PickUpItemDto.java | 23 ++++
10 files changed, 252 insertions(+), 5 deletions(-)
diff --git a/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/order/pick/PickUpDto.java b/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/order/pick/PickUpDto.java
new file mode 100644
index 0000000..8509d6a
--- /dev/null
+++ b/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/order/pick/PickUpDto.java
@@ -0,0 +1,53 @@
+package com.hx.phiappt.dto.order.pick;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鎻愯揣鍗曟墿灞�
+ * */
+@Data
+public class PickUpDto {
+ /***********蹇呭～椤�*********************/
+ /**绫诲瀷(鍏蜂綋鍊肩湅涓嬮潰甯搁噺)*/
+ private Integer type;
+ /**鎻愯揣鍗曠敓鎴愭潵婧愮被鍨�(鍏蜂綋鍊肩湅涓嬮潰甯搁噺)*/
+ private Integer commonType;
+ /**鎻愯揣鍗曠敓鎴愭潵婧愭爣璇�*/
+ private String commonId;
+ /**鎿嶄綔浜虹被鍨�(鍏蜂綋鍊肩湅涓嬮潰甯搁噺)*/
+ private Integer opManType;
+ /**鎿嶄綔浜烘爣璇�(鎿嶄綔浜轰负绯荤粺鍙笉浼�)*/
+ private String opManId;
+ /**鎿嶄綔澶囨敞*/
+ private String remark;
+ /**鎻愯揣璇︽儏*/
+ private List<PickUpItemDto> items;
+
+ /***********鍙～椤�(鍙紶灏介噺浼�)*********************/
+ /**闂ㄥ簵鏍囪瘑*/
+ private String shopId;
+ /**鍖荤敓鏍囪瘑*/
+ private String doctorId;
+ /**绉戝鏍囪瘑*/
+ private String roomId;
+ /**瀹㈡埛鏍囪瘑*/
+ private String userId;
+
+
+ /**绫诲瀷-鍟嗗搧鎻愯揣鍗�*/
+ public static Integer TYPE_GOODS = 1;
+ /**绫诲瀷-鑽搧鎻愯揣鍗�*/
+ public static Integer TYPE_MEDICINE = 2;
+
+ /**鏉ユ簮绫诲瀷-璁㈠崟*/
+ public static Integer SOURCE_TYPE_ORDER = 0;
+
+ /**鎿嶄綔浜虹被鍨�-绯荤粺*/
+ public static Integer OP_MAN_TYPE_SYS = 0;
+ /**鎿嶄綔浜虹被鍨�-鍛樺伐*/
+ public static Integer OP_MAN_TYPE_EMPLOYEE = 1;
+ /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛*/
+ public static Integer OP_MAN_TYPE_USER = 2;
+}
diff --git a/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/order/pick/PickUpItemDto.java b/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/order/pick/PickUpItemDto.java
new file mode 100644
index 0000000..9fa92aa
--- /dev/null
+++ b/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/order/pick/PickUpItemDto.java
@@ -0,0 +1,23 @@
+package com.hx.phiappt.dto.order.pick;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 鎻愯揣鍗曟墿灞�
+ * */
+@Data
+public class PickUpItemDto {
+ /***********蹇呭～椤�*********************/
+ /**鑰楁潗鏍囪瘑*/
+ private String consumablesId;
+ /**闇�瑕佹彁璐ф暟閲�*/
+ private Integer needNum;
+
+ /***********闈炲繀濉」*********************/
+ /**鎬绘暟閲�(涓嶄紶榛樿璁句负闇�瑕佹彁璐ф暟閲�)*/
+ private Integer num;
+ /**璁㈠崟涓晢鍝�(鑽搧)鐨勫崟浠�*/
+ private BigDecimal orderPrice;
+}
diff --git a/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/order/stock/StockChangeDto.java b/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/order/stock/StockChangeDto.java
new file mode 100644
index 0000000..52d0c50
--- /dev/null
+++ b/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/order/stock/StockChangeDto.java
@@ -0,0 +1,82 @@
+package com.hx.phiappt.dto.order.stock;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鍑哄叆搴撳弬鏁�
+ * @author fwq
+ */
+@Data
+public class StockChangeDto {
+ /************************蹇呭～******************************/
+ /**鏀瑰彉绫诲瀷鏍囪瘑(鍏蜂綋绫诲瀷)(鏌ヨ〃shop_warehouse_type鎷縤d)*/
+ private String changeType;
+ /**鍏宠仈鐨勫叕鍏辩被鍨�(鍏蜂綋鐪嬩笅闈㈢殑甯搁噺)*/
+ private Integer commonType;
+ /**鍏宠仈鐨勫叕鍏辨爣璇�*/
+ private String commonId;
+ /**鍒涘缓浜虹被鍨�(鍏蜂綋鐪嬩笅闈㈢殑甯搁噺)*/
+ private Integer creatorType;
+ /**鍒涘缓浜烘爣璇�*/
+ private String creator;
+ /**鍒涘缓浜哄悕绉�*/
+ private String creatorName;
+ /**澶囨敞淇℃伅*/
+ private String remarks;
+ /**搴撳瓨鏀瑰彉鏄庣粏*/
+ List<StockChangeItemDto> stockItemList;
+
+ /************************闈炲繀濉�******************************/
+ /**鍑哄叆搴撲汉鏍囪瘑(鍛樺伐)*/
+ private String opStockId;
+ /**鍑哄叆搴撲汉鏍囪瘑(鍛樺伐)鍚�*/
+ private String opStockName;
+ /**渚涘簲鍟嗘爣璇�(渚涘簲鍟嗚〃)*/
+ private String supplierId;
+ /**渚涘簲鍟嗗悕*/
+ private String supplierName;
+ /**棰嗙敤绉戝鏍囪瘑(绉戝琛�)*/
+ private String roomId;
+ /**棰嗙敤绉戝鍚�*/
+ private String roomName;
+ /**棰嗙敤閮ㄩ棬鏍囪瘑(閮ㄩ棬琛�)*/
+ private String departmentId;
+ /**棰嗙敤閮ㄩ棬鍚�*/
+ private String departmentName;
+ /**棰嗙敤浜烘爣璇�(鍛樺伐)*/
+ private String receiver;
+ /**棰嗙敤浜哄悕*/
+ private String receiverName;
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String customer;
+ /**鐢ㄦ埛鍚�*/
+ private String customerName;
+ /**鍙戠エ鍙�*/
+ private String bill;
+
+
+
+ /**鍏宠仈鐨勫叕鍏辩被鍨�-鎻愯揣鍗曞嚭搴�*/
+ public static Integer COMMON_TYPE_PICK_UP = 0;
+ /**鍏宠仈鐨勫叕鍏辩被鍨�-鍒掓墸姝ｅ父鍑哄簱*/
+ public static Integer COMMON_TYPE_BUCKLE = 1;
+ /**鍏宠仈鐨勫叕鍏辩被鍨�-鍒掓墸淇敼鍑哄簱*/
+ public static Integer COMMON_TYPE_UPDATE_OUT = 1;
+
+ /**鍏宠仈鐨勫叕鍏辩被鍨�-鍒掓墸淇敼鍏ュ簱*/
+ public static Integer COMMON_TYPE_UPDATE_IN = 2;
+ /**鍏宠仈鐨勫叕鍏辩被鍨�-鍒掓墸浣滃簾鍏ュ簱*/
+ public static Integer COMMON_TYPE_BUCKLE_INVALID = 3;
+ /**鍏宠仈鐨勫叕鍏辩被鍨�-鍟嗗搧閫�鍥炲叆搴�*/
+ public static Integer COMMON_TYPE_GOODS_RETURN = 4;
+
+
+ /**鍒涘缓浜虹被鍨�-绯荤粺*/
+ public static Integer CREATE_TYPE_SYS = 0;
+ /**鍒涘缓浜虹被鍨�-鍛樺伐*/
+ public static Integer CREATE_TYPE_EMPLOYEE = 1;
+ /**鍒涘缓浜虹被鍨�-鐢ㄦ埛*/
+ public static Integer CREATE_TYPE_USER = 2;
+}
diff --git a/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/order/stock/StockChangeItemDto.java b/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/order/stock/StockChangeItemDto.java
new file mode 100644
index 0000000..657a0c7
--- /dev/null
+++ b/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/order/stock/StockChangeItemDto.java
@@ -0,0 +1,17 @@
+package com.hx.phiappt.dto.order.stock;
+
+import lombok.Data;
+
+/**
+ * 鍑哄叆搴撹鎯�
+ * @author fwq
+ */
+@Data
+public class StockChangeItemDto {
+ /***********蹇呭～***********************/
+ /**搴撳瓨鏍囪瘑(琛╯hop_warehouse_item)*/
+ private String shopItemId;
+ /**鍙樺寲鏁伴噺(鍑哄簱璐燂紝鍏ュ簱姝�)*/
+ private Integer num;
+
+}
\ No newline at end of file
diff --git a/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/stock/StockDto.java b/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/stock/StockDto.java
new file mode 100644
index 0000000..249f5d4
--- /dev/null
+++ b/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/stock/StockDto.java
@@ -0,0 +1,16 @@
+package com.hx.phiappt.dto.stock;
+
+import lombok.Data;
+
+/**
+ * 搴撳瓨鎵╁睍
+ * @author fwq
+ */
+@Data
+public class StockDto {
+
+ /**绫诲瀷:0鑰楁潗,1浠撳簱*/
+ private Integer commonType;
+ /**鏍囪瘑*/
+ private String commonId;
+}
diff --git a/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/vo/CommodityMessageVo.java b/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/vo/CommodityMessageVo.java
index 2b7bd84..c0b706c 100644
--- a/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/vo/CommodityMessageVo.java
+++ b/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/vo/CommodityMessageVo.java
@@ -13,21 +13,18 @@
*/
@Data
public class CommodityMessageVo {
+ /**璇锋眰鍦板潃*/
+ private String sendUrl;
/** 璐﹀鍚嶇О(蹇呭～)*/
private String accountName;
-
/** 甯搁噺:04bd473e01c0e0e0676d213172c544d6(蹇呭～)*/
private String token;
-
/** 绛惧悕:MD5(RequestData+Token)(蹇呭～)*/
private String sign;
-
/** 甯搁噺:BusinessRequest(蹇呭～)*/
private String requestName;
-
/** 涓氬姟璇锋眰JSON鏂囨湰鏁版嵁(蹇呭～)*/
private JSONObject requestData;
-
/** 鍟嗗搧缂栫爜*/
private String cgoodsid;
diff --git a/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/vo/ERPInventoryVo.java b/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/vo/ERPInventoryVo.java
index 7b71111..c3a5510 100644
--- a/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/vo/ERPInventoryVo.java
+++ b/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/vo/ERPInventoryVo.java
@@ -9,6 +9,8 @@
*/
@Data
public class ERPInventoryVo {
+ /**璇锋眰鍦板潃*/
+ private String sendUrl;
/** 璐﹀鍚嶇О*/
private String accountName;
/** 甯搁噺:04bd473e01c0e0e0676d213172c544d6*/
diff --git a/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/vo/ShopWarehouseMessageVo.java b/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/vo/ShopWarehouseMessageVo.java
index bd88dd7..76c0ee5 100644
--- a/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/vo/ShopWarehouseMessageVo.java
+++ b/phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/vo/ShopWarehouseMessageVo.java
@@ -9,6 +9,8 @@
*/
@Data
public class ShopWarehouseMessageVo {
+ /**璇锋眰鍦板潃*/
+ private String sendUrl;
/** 璐﹀鍚嶇О*/
private String accountName;
/** 甯搁噺:04bd473e01c0e0e0676d213172c544d6*/
diff --git a/phi-warehouse-feign/src/main/java/com/hx/phiappt/feign/WOrderService.java b/phi-warehouse-feign/src/main/java/com/hx/phiappt/feign/WOrderService.java
new file mode 100644
index 0000000..7a22c82
--- /dev/null
+++ b/phi-warehouse-feign/src/main/java/com/hx/phiappt/feign/WOrderService.java
@@ -0,0 +1,34 @@
+package com.hx.phiappt.feign;
+
+import com.hx.phiappt.dto.order.pick.PickUpDto;
+import com.hx.phiappt.dto.order.stock.StockChangeDto;
+import com.hx.resultTool.Result;
+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-warehouse-user", path = "/warehouse-user",contextId = "warehouse-order")
+public interface WOrderService {
+
+ /**
+ * 鐢熸垚鍟嗗搧鎻愯揣鍗�
+ */
+ @PostMapping(value = "/order/create/pack/up")
+ Result pickUpOrder(@RequestBody PickUpDto pickUpDto);
+
+ /**
+ * 鐢熸垚鍟嗗搧鍑哄簱鍗�
+ */
+ @PostMapping(value = "/order/create/out/stock")
+ Result outStockOrder(@RequestBody StockChangeDto stockChangeDto);
+
+ /**
+ * 鐢熸垚鍟嗗搧鍏ュ簱鍗�
+ */
+ @PostMapping(value = "/order/create/in/stock")
+ Result inStockOrder(@RequestBody StockChangeDto stockChangeDto);
+
+}
diff --git a/phi-warehouse-feign/src/main/java/com/hx/phiappt/feign/WStcokService.java b/phi-warehouse-feign/src/main/java/com/hx/phiappt/feign/WStcokService.java
new file mode 100644
index 0000000..48986aa
--- /dev/null
+++ b/phi-warehouse-feign/src/main/java/com/hx/phiappt/feign/WStcokService.java
@@ -0,0 +1,21 @@
+package com.hx.phiappt.feign;
+
+import com.hx.phiappt.dto.stock.StockDto;
+import com.hx.resultTool.Result;
+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-warehouse-user", path = "/warehouse-user",contextId = "warehouse-stock")
+public interface WStcokService {
+
+ /**
+ * 鏇存柊搴撳瓨淇℃伅
+ */
+ @PostMapping(value = "/stock/update/one")
+ Result updateStock(@RequestBody StockDto stockDto);
+
+}
--
Gitblit v1.8.0