Commits · 9a060bbb0b2b0d37683491253ef7379618e3f229 · Wyh / supplier · GitLab

05 Mar, 2021 2 commits
- 1、细项颜色可配 2、沽清分页码样式调整 · 9a060bbb
  宁斌 committed Mar 05, 2021
  
  9a060bbb Browse Files
- 1、okhttp canceh配置 2、餐台模式食品套餐可配置颜色 3、删除xLog日志库依赖 4、添加Retrofit配置 · b0548d5f
  宁斌 committed Mar 05, 2021
  
  b0548d5f Browse Files
04 Mar, 2021 1 commit
- PrinterFlowProxy类调整 · 522480e0
  宁斌 committed Mar 04, 2021
  
  522480e0 Browse Files
03 Mar, 2021 1 commit
- 1、解决本机打印流程Dialog setText无效问题 · 32aeaa84
  宁斌 committed Mar 03, 2021
  
  32aeaa84 Browse Files
02 Mar, 2021 3 commits
- 長連接日誌調整' · 7376ca17
  宁斌 committed Mar 02, 2021
  
  7376ca17 Browse Files
- Merge branch 'dev' into connection · 75ef1b51
```
# Conflicts:
#	library-common/src/main/java/com/gingersoft/gsa/cloud/common/service/GetInfoUpdateService.kt
```
  宁斌 committed Mar 02, 2021
  75ef1b51 Browse Files
- 1、長連接notifity彈窗調整 · 7497f0af
  宁斌 committed Mar 02, 2021
  
  7497f0af Browse Files
26 Feb, 2021 3 commits
- 1、長連接通知欄調整 · eb61db35
  宁斌 committed Feb 26, 2021
  
  eb61db35 Browse Files
- 1、處理打印dialog消失前有黑屏問題 · 17910593
  宁斌 committed Feb 26, 2021
  
  17910593 Browse Files
- 1、打印流程可視化調整 2、prj長連接替換輪詢 · 7e27ec13
  宁斌 committed Feb 26, 2021
  
  7e27ec13 Browse Files
24 Feb, 2021 4 commits
- 1、針式打印prj重複問題 2、打印進度 · d315d8ac
  Wyh committed Feb 24, 2021
  
  d315d8ac Browse Files
- 1、合併代碼、針式打印優化 · a4496333
  Wyh committed Feb 24, 2021
  
  a4496333 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · a45cdb6d
```
# Conflicts:
#	component-print/src/main/java/com/joe/print/mvp/print/EpsonPrint.java
#	component-print/src/main/java/com/joe/print/mvp/print/service/PrjService.java
#	component-print/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java
#	library-common/src/main/java/com/gingersoft/gsa/cloud/common/printer/plugins/PrinterFlowListener.java
#	library-print/src/main/java/com/gingersoft/gsa/cloud/print/PrintSocketHolder.java
```
  Wyh committed Feb 24, 2021
  a45cdb6d Browse Files
- 1、增加打印埋点 2、餐台模式禅道bug处理 3、新增打印流程可视化dialog · 36db1aef
  宁斌 committed Feb 24, 2021
  
  36db1aef Browse Files
23 Feb, 2021 1 commit
- 1、優化prj查詢頁面 2、歷史訂單顯示優化 3、針式打印回調問題修改 4、增加多種打印失敗問題返回給後台 5、供應鏈發送BUG修復 6、打印類修改 · 33ba7f75
  Wyh committed Feb 23, 2021
  
  33ba7f75 Browse Files
20 Feb, 2021 1 commit
- 1、打印模塊優化 2、餐檯模式印單不打印食品問題 3、打印上菜紙閃退問題處理 4、餐檯模式結賬不打印食品問題 · f410baeb
  Wyh committed Feb 20, 2021
  
  f410baeb Browse Files
04 Feb, 2021 3 commits
- Merge remote-tracking branch 'origin/dev' into dev · bc663d6d
  Wyh committed Feb 04, 2021
  
  bc663d6d Browse Files
- 1、彈窗關閉優化 2、預約單無法自動接單問題 3、供應鏈刪除單位、加運費、焦點遺失問題 · a2715edb
  Wyh committed Feb 04, 2021
  
  a2715edb Browse Files
- 添加餐台模式埋点 · 5cf2e2a2
  宁斌 committed Feb 04, 2021
  
  5cf2e2a2 Browse Files
03 Feb, 2021 3 commits
- Merge branch 'dev' of http://gitlab.ricepon.com/ningbin/GSA-Cloud into dev · 890979d5
```
 Conflicts:
	component-table/src/main/res/layout/table_dialog_cancel_food.xml
```
  宁斌 committed Feb 03, 2021
  890979d5 Browse Files
- 1、印單打印問題 2、供應鏈運費代碼 · 94e2feb7
  Wyh committed Feb 03, 2021
  
  94e2feb7 Browse Files
- 1、添加餐檯模式埋點記錄 2、餐檯模式選擇取消彈窗閃退問題處理 3、skyorder餐檯刪除數量提示調整為後台返回 · ef2056da
  宁斌 committed Feb 03, 2021
  
  ef2056da Browse Files
02 Feb, 2021 5 commits
- Merge remote-tracking branch 'origin/dev' into dev · e9bb692c
```
# Conflicts:
#	component-print/src/main/java/com/joe/print/mvp/print/service/PrjService.java
```
  Wyh committed Feb 02, 2021
  e9bb692c Browse Files
- 1、凍鏈的訂單碼調整 2、prj優化 3、供應鏈單位快捷輸入的刪除功能 · 7b3307da
  Wyh committed Feb 02, 2021
  
  7b3307da Browse Files
- Merge branch 'dev' of http://gitlab.ricepon.com/ningbin/GSA-Cloud into dev · 2194c6e3
```
 Conflicts:
	library-common/build.gradle
```
  宁斌 committed Feb 02, 2021
  2194c6e3 Browse Files
- 新增自定義日誌類型 · 476dc755
  宁斌 committed Feb 02, 2021
  
  476dc755 Browse Files
- 新增自定義業務日誌類型 · 338ec9ae
  宁斌 committed Feb 02, 2021
  
  338ec9ae Browse Files
30 Jan, 2021 3 commits
- 打印日志补全日志上传接口调整为HKTest 餐台模式子项排序条件新增CreateTime · 11a0c395
  宁斌 committed Jan 30, 2021
  
  11a0c395 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 09fb6511
```
# Conflicts:
#	component-coldchain/src/main/java/com/gingersoft/coldchain_module/mvp/ui/activity/OrderDetailsActivity.java
```
  Wyh committed Jan 30, 2021
  09fb6511 Browse Files
- 1、打印的recyclerview切換成普通視圖 · 60d1a9cf
```
2、供應鏈驗收代碼
```
  Wyh committed Jan 30, 2021
  60d1a9cf Browse Files
29 Jan, 2021 3 commits
- 1、打印流程日志埋点 · 7678dfd3
  宁斌 committed Jan 29, 2021
  
  7678dfd3 Browse Files
- 1、供應鏈代碼1.29 · d3938c2e
  Wyh committed Jan 29, 2021
  
  d3938c2e Browse Files
- Revert "1.2.1測試版" · 35f60e81
```
This reverts commit 8fbea4e5
```
  宁斌 committed Jan 29, 2021
  35f60e81 Browse Files
28 Jan, 2021 4 commits
- 1.2.1測試版 · 8fbea4e5
  宁斌 committed Jan 28, 2021
  
  8fbea4e5 Browse Files
- 1、餐台区域添加限制空格 2、Prj打印格式調整 3、堂食Prj打印不了的問題 4、冷鏈訂單號顯示字段改為TakeFoodCode · 5f8fe0fe
  宁斌 committed Jan 28, 2021
  
  5f8fe0fe Browse Files
- 1、餐檯區域空格限制 · 048529c4
  宁斌 committed Jan 28, 2021
  
  048529c4 Browse Files
- BaseQMUI替換 · d52a317c
  宁斌 committed Jan 28, 2021
  
  d52a317c Browse Files
25 Jan, 2021 3 commits
- Merge remote-tracking branch 'origin/dev' into dev · 8805141a
```
# Conflicts:
#	component-print/src/main/java/com/joe/print/mvp/print/service/PrjService.java
#	component-print/src/main/java/com/joe/print/mvp/ui/view/KitChenPrjFoodView.java
```
  宁斌 committed Jan 25, 2021
  8805141a Browse Files
- 1、完善外賣自取歷史訂單調整 2、新增打印流程監聽類 3、新增Prj原圖查看頁面 · 575c626d
  宁斌 committed Jan 25, 2021
  
  575c626d Browse Files
- 修改PRJ · 67072339
  Wyh committed Jan 25, 2021
  
  67072339 Browse Files