Skip to content

Quilan / medicinal-supplier

Go to a project
Toggle navigation
Toggle navigation pinning
1436cea7 by Quilan
Options

1

1 parent 2839757d
Inline Side-by-side
Showing 4 changed files with 23 additions and 3 deletions
conf/prod/config.properties
...@@ -7,6 +7,8 @@ jdbc.password=BOE190326jdfyy ...@@ -7,6 +7,8 @@ jdbc.password=BOE190326jdfyy
7 7
8 spd_service_url = http://10.146.9.50:8080/medicinal-web/a/spdrecvsupplier/ 8 spd_service_url = http://10.146.9.50:8080/medicinal-web/a/spdrecvsupplier/
9 9
10 spd_common_url = http://10.146.9.50:8080/medicinal-web/a/
11
10 huarun_service_url = http://61.190.54.189:8001/huarun/spd/syn/ 12 huarun_service_url = http://61.190.54.189:8001/huarun/spd/syn/
11 13
12 platform_url= http://61.190.54.189:8001/huarun/ 14 platform_url= http://61.190.54.189:8001/huarun/
......
src/main/java/com/phxl/common/constants/PlatformConstant.java
...@@ -10,6 +10,9 @@ public class PlatformConstant { ...@@ -10,6 +10,9 @@ public class PlatformConstant {
10 //SPD接口地址 10 //SPD接口地址
11 public static final String PlatForm_SPD_Url = Global.getConfig("spd_service_url"); 11 public static final String PlatForm_SPD_Url = Global.getConfig("spd_service_url");
12 12
13 //SPD接口地址
14 public static final String PlatForm_SPD_Common_Url = Global.getConfig("spd_common_url");
15
13 //推送对账,发药,库存平台地址 16 //推送对账,发药,库存平台地址
14 public static final String PlatForm_URL = Global.getConfig("platform_url"); 17 public static final String PlatForm_URL = Global.getConfig("platform_url");
15 18
......
src/main/java/com/phxl/modules/goods/web/spd/SpdControlller.java
...@@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletRequest; ...@@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletRequest;
8 8
9 import com.phxl.modules.goods.entity.billback.BillBackWithDetail; 9 import com.phxl.modules.goods.entity.billback.BillBackWithDetail;
10 10
11 import org.apache.commons.fileupload.disk.DiskFileItem;
11 import org.apache.http.HttpEntity; 12 import org.apache.http.HttpEntity;
12 import org.apache.http.HttpResponse; 13 import org.apache.http.HttpResponse;
13 import org.apache.http.NameValuePair; 14 import org.apache.http.NameValuePair;
...@@ -29,24 +30,36 @@ import org.springframework.web.bind.annotation.RequestMethod; ...@@ -29,24 +30,36 @@ import org.springframework.web.bind.annotation.RequestMethod;
29 import org.springframework.web.bind.annotation.RequestParam; 30 import org.springframework.web.bind.annotation.RequestParam;
30 import org.springframework.web.bind.annotation.ResponseBody; 31 import org.springframework.web.bind.annotation.ResponseBody;
31 import org.springframework.web.multipart.MultipartFile; 32 import org.springframework.web.multipart.MultipartFile;
33 import org.springframework.web.multipart.commons.CommonsMultipartFile;
32 34
33 import com.alibaba.fastjson.JSON; 35 import com.alibaba.fastjson.JSON;
34 import com.alibaba.fastjson.JSONObject; 36 import com.alibaba.fastjson.JSONObject;
37 import com.alibaba.fastjson.serializer.SerializerFeature;
38 import com.fasterxml.jackson.annotation.JsonFormat;
35 import com.phxl.common.constants.PlatformConstant; 39 import com.phxl.common.constants.PlatformConstant;
36 import com.phxl.common.response.PlatFormResponse; 40 import com.phxl.common.response.PlatFormResponse;
37 import com.phxl.common.response.PlatFormResponseConstant; 41 import com.phxl.common.response.PlatFormResponseConstant;
38 import com.phxl.common.util.HTTPClient; 42 import com.phxl.common.util.HTTPClient;
43 import com.phxl.common.util.JsonMapper;
39 import com.phxl.common.utils.IdUtil; 44 import com.phxl.common.utils.IdUtil;
45 import com.phxl.modules.goods.entity.billback.BillBack;
46 import com.phxl.modules.goods.entity.billsettlement.BillSettlement;
40 import com.phxl.modules.goods.entity.billsettlement.BillSettlementWithDetail; 47 import com.phxl.modules.goods.entity.billsettlement.BillSettlementWithDetail;
41 import com.phxl.modules.goods.entity.ctcareprov.CTCareProv; 48 import com.phxl.modules.goods.entity.ctcareprov.CTCareProv;
42 import com.phxl.modules.goods.entity.ctdept.HisCtDept; 49 import com.phxl.modules.goods.entity.ctdept.HisCtDept;
43 import com.phxl.modules.goods.entity.hisCtMedicineMaterial.HisCtMedicineMaterial; 50 import com.phxl.modules.goods.entity.hisCtMedicineMaterial.HisCtMedicineMaterial;
51 import com.phxl.modules.goods.entity.invoiceback.SuInvoiceBack;
44 import com.phxl.modules.goods.entity.invoiceback.SuInvoiceBackWithDetail; 52 import com.phxl.modules.goods.entity.invoiceback.SuInvoiceBackWithDetail;
45 import com.phxl.modules.goods.entity.medinstore.MedInStoreWithDetail; 53 import com.phxl.modules.goods.entity.medinstore.MedInStoreWithDetail;
54 import com.phxl.modules.goods.entity.medplan.MedPlan;
46 import com.phxl.modules.goods.entity.medplan.MedPlanWithDetail; 55 import com.phxl.modules.goods.entity.medplan.MedPlanWithDetail;
56 import com.phxl.modules.goods.entity.medstock.MedStock;
47 import com.phxl.modules.goods.entity.medstock.MedStockList; 57 import com.phxl.modules.goods.entity.medstock.MedStockList;
58 import com.phxl.modules.goods.entity.spills.HisSpills;
48 import com.phxl.modules.goods.entity.spills.HisSpillsList; 59 import com.phxl.modules.goods.entity.spills.HisSpillsList;
60 import com.phxl.modules.goods.entity.suoutstore.SuOutStore;
49 import com.phxl.modules.goods.entity.suoutstore.SuOutStoreWithDetail; 61 import com.phxl.modules.goods.entity.suoutstore.SuOutStoreWithDetail;
62 import com.phxl.modules.goods.entity.supplierstock.SupplierStock;
50 import com.phxl.modules.goods.entity.supplierstock.SupplierStockList; 63 import com.phxl.modules.goods.entity.supplierstock.SupplierStockList;
51 import com.phxl.modules.goods.entity.supplygoods.MedSupplyGoods; 64 import com.phxl.modules.goods.entity.supplygoods.MedSupplyGoods;
52 import com.phxl.modules.goods.service.billback.BillBackService; 65 import com.phxl.modules.goods.service.billback.BillBackService;
...@@ -944,7 +957,7 @@ public class SpdControlller { ...@@ -944,7 +957,7 @@ public class SpdControlller {
944 logger.debug("查询库存:{}", params); 957 logger.debug("查询库存:{}", params);
945 String result = ""; 958 String result = "";
946 try { 959 try {
947 result = HTTPClient.sendJsonDataByPost("http://10.146.8.221:9002/medicinal-web/a/StoreDetail/queryDrugByDeptAll", params); 960 result = HTTPClient.sendJsonDataByPost(PlatformConstant.PlatForm_SPD_Common_Url+"StoreDetail/queryDrugByDeptAll", params);
948 } catch (Exception e) { 961 } catch (Exception e) {
949 result = e.getMessage(); 962 result = e.getMessage();
950 } 963 }
...@@ -962,7 +975,7 @@ public class SpdControlller { ...@@ -962,7 +975,7 @@ public class SpdControlller {
962 logger.debug("查询近效期:{}", params); 975 logger.debug("查询近效期:{}", params);
963 String result = ""; 976 String result = "";
964 try { 977 try {
965 result = HTTPClient.sendJsonDataByPost("http://10.146.8.221:9002/medicinal-web/a/ypjxq/statics/list", params); 978 result = HTTPClient.sendJsonDataByPost(PlatformConstant.PlatForm_SPD_Common_Url+"ypjxq/statics/list", params);
966 } catch (Exception e) { 979 } catch (Exception e) {
967 result = e.getMessage(); 980 result = e.getMessage();
968 } 981 }
...@@ -990,7 +1003,7 @@ public class SpdControlller { ...@@ -990,7 +1003,7 @@ public class SpdControlller {
990 param.add(new BasicNameValuePair("pageSize",objec.getString("pageSize"))); 1003 param.add(new BasicNameValuePair("pageSize",objec.getString("pageSize")));
991 param.add(new BasicNameValuePair("startTime",objec.getString("startTime"))); 1004 param.add(new BasicNameValuePair("startTime",objec.getString("startTime")));
992 param.add(new BasicNameValuePair("endTime",objec.getString("endTime"))); 1005 param.add(new BasicNameValuePair("endTime",objec.getString("endTime")));
993 HttpPost post = new HttpPost("http://10.146.8.221:9002/medicinal-web/a/statics/delayStore/list"); 1006 HttpPost post = new HttpPost(PlatformConstant.PlatForm_SPD_Common_Url+"statics/delayStore/list");
994 post.setHeader("Content-Type", "application/x-www-form-urlencoded"); 1007 post.setHeader("Content-Type", "application/x-www-form-urlencoded");
995 post.setEntity(new UrlEncodedFormEntity(param)); 1008 post.setEntity(new UrlEncodedFormEntity(param));
996 HttpResponse reponse = client.execute(post); 1009 HttpResponse reponse = client.execute(post);
......
src/main/resources/config.properties
...@@ -7,6 +7,8 @@ jdbc.password=BOE190326jdfyy ...@@ -7,6 +7,8 @@ jdbc.password=BOE190326jdfyy
7 7
8 spd_service_url = http://10.146.9.50:8080/medicinal-web/a/spdrecvsupplier/ 8 spd_service_url = http://10.146.9.50:8080/medicinal-web/a/spdrecvsupplier/
9 9
10 spd_common_url = http://10.146.9.50:8080/medicinal-web/a/
11
10 huarun_service_url = http://61.190.54.189:8001/huarun/spd/syn/ 12 huarun_service_url = http://61.190.54.189:8001/huarun/spd/syn/
11 13
12 platform_url= http://61.190.54.189:8001/huarun/ 14 platform_url= http://61.190.54.189:8001/huarun/
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!