Commits · 5b0327e5ba41e1de6f737d0a2c5130e73619c74e · Wyh / supplier

17 Dec, 2020 1 commit
- 1、供應鏈的食品列表，採購單列表，分類頁面功能，購物車 · 5b0327e5
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Dec 17, 2020
  5b0327e5 Browse Files
05 Dec, 2020 1 commit
- 1、供應鏈下單，食品列表 · c1f2f178
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Dec 05, 2020
  c1f2f178 Browse Files
04 Dec, 2020 4 commits

1、同步代碼 2、供應鏈相關開發 · 50265e6a
```
Signed-off-by: Wyh <1239658231>
```
Wyh committed Dec 04, 2020
50265e6a Browse Files

Merge branch 'supplier' into dev · 6c375e65

# Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/app/GsaCloudApplication.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/common/config/expandconfig/FunctionExtendedConfiguration.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/common/service/GetInfoUpdateService.kt
#	base-module/src/main/java/com/gingersoft/gsa/cloud/common/ui/adapter/multi/InfoMultiAdapter.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/common/ui/adapter/multi/InputProvider.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/common/utils/glide/GlideUtils.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/common/utils/inputFilter/InputFilterUtils.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/config/globalconfig/applyOptions/MyRetrofitConfiguration.java
#	base-module/src/main/res/layout/print_kitchen.xml
#	delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/service/GetInfoUpdateService.kt
#	login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/ui/activity/ChooseRestaurantActivity.java
#	print-module/src/main/java/com/joe/print/mvp/print/PrintPrjKitchen.java
#	print-module/src/main/java/com/joe/print/mvp/print/PrintSlip.java
#	supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/contract/NewSupplierContract.java
#	supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/presenter/NewSupplierPresenter.java
#	supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/server/SupplierServer.java
#	supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/NewFoodUnitFragment.java
#	supply-chain-module/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/NewSupplierFragment.java

committed Dec 04, 2020

6c375e65 Browse Files

1、供應鏈相關開發 · 128c9696
```
Signed-off-by: Wyh <1239658231>
```
Wyh committed Dec 04, 2020
128c9696 Browse Files
bbpos打印堂食印單，結賬單調整 · e84ec885
宁斌 committed Dec 04, 2020

e84ec885 Browse Files

03 Dec, 2020 1 commit
- bbpos打印細節調整，新增擴展自動（點選支付方式是否彈出輸入框，餐檯模式開檯自動彈出輸入人數彈窗） · 9029ddf2
  宁斌 committed Dec 03, 2020
  
  9029ddf2 Browse Files
02 Dec, 2020 1 commit
- bbpos打印調整 · 70d85024
  宁斌 committed Dec 02, 2020
  
  70d85024 Browse Files
01 Dec, 2020 1 commit
- 外賣接單結賬單，外賣接單印單 · fb2f2dca
  宁斌 committed Dec 01, 2020
  
  fb2f2dca Browse Files
29 Nov, 2020 1 commit
- bbpos結賬單，qrcode打印處理 · 922cde77
  宁斌 committed Nov 29, 2020
  
  922cde77 Browse Files
26 Nov, 2020 1 commit
- Compontent統一到base模塊下，xfunction相關處理 · d7c21e36
  宁斌 committed Nov 26, 2020
  
  d7c21e36 Browse Files
24 Nov, 2020 5 commits
- 1、合併代碼 · 02ccf7de
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Nov 24, 2020
  02ccf7de Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · ecc42b4a
```
# Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/app/GsaCloudApplication.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/config/globalconfig/applyOptions/MyGlobalHttpHandler.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/BillItemAdapter.java
```
  Wyh committed Nov 24, 2020
  ecc42b4a Browse Files
- 1、增加供應鏈服務器地址 2、新增多類型adapter 3、供應鏈供應商、單位管理 · 9ed1d78e
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Nov 24, 2020
  9ed1d78e Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 17ab71e1
```
# Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/config/globalconfig/applyOptions/MyGlobalHttpHandler.java
```
  宁斌 committed Nov 24, 2020
  17ab71e1 Browse Files
- 1、新增功能管理相關類 2、Logan相關類調整 · 117ee100
  宁斌 committed Nov 24, 2020
  
  117ee100 Browse Files
21 Nov, 2020 1 commit
- 1、統一網絡請求頭HeadersInterceptor 2、加入美團日誌框架logan對（網絡請求，頁面生命週期）進行埋點 3、增加user狀態管理類 · c4e6855d
  宁斌 committed Nov 21, 2020
  
  c4e6855d Browse Files
20 Nov, 2020 2 commits
- Merge remote-tracking branch 'origin/dev' into dev · aba2a0c0
  Wyh committed Nov 20, 2020
  
  aba2a0c0 Browse Files
- 1、餐牌時段的增刪改查 2、餐牌餐種的增刪改查 3、打印新增打印路徑，prj打印模式 4、供應鏈模塊 · 9dde516f
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Nov 20, 2020
  9dde516f Browse Files
19 Nov, 2020 1 commit
- 餐檯輪訓調整 · f99df214
  宁斌 committed Nov 19, 2020
  
  f99df214 Browse Files
13 Nov, 2020 3 commits
- Merge remote-tracking branch 'origin/dev' into dev · 2abd64bd
```
# Conflicts:
#	base-module/build.gradle
#	base-module/src/main/java/com/gingersoft/gsa/cloud/config/globalconfig/GlobalConfiguration.java
#	delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/network/ServiceCreator.kt
#	delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/presenter/SendOrderPresenter.java
```
  宁斌 committed Nov 13, 2020
  2abd64bd Browse Files
- 食品支持多个折扣接口结构调整 · 1d233a8d
  宁斌 committed Nov 13, 2020
  
  1d233a8d Browse Files
- 1、ConfigModule配置清單修改 2、餐廳擴展表的編輯BUG修復、提交修改優化 3、重印prjbug修復 4、導入jcifs PC共享文件jar包 · ceec008e
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Nov 13, 2020
  ceec008e Browse Files
11 Nov, 2020 1 commit
- 部分javabean名稱修改，打印skyorder流程處理 · bd5562ed
  宁斌 committed Nov 11, 2020
  
  bd5562ed Browse Files
10 Nov, 2020 3 commits

1、外送自動接單 2、外送自取、預約單自動接單 · e209e25a
```
Signed-off-by: Wyh <1239658231>
```
Wyh committed Nov 10, 2020
e209e25a Browse Files

Merge remote-tracking branch 'origin/dev' into dev · c6a57b39

# Conflicts:
#	config.gradle
#	delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/presenter/SendOrderPresenter.java
#	print-module/src/main/java/com/joe/print/mvp/print/PrintOtherOrder.java
#	print-module/src/main/java/com/joe/print/mvp/print/PrintOtherOrderClosing.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/TableActivity.java

committed Nov 10, 2020

c6a57b39 Browse Files

1、優化prj廚房單打印邏輯 2、餐牌的食品列表 · e65ccb3b
```
Signed-off-by: Wyh <1239658231>
```
Wyh committed Nov 10, 2020
e65ccb3b Browse Files

07 Nov, 2020 2 commits
- 添加哆啦A夢插件，skorder模式長按鎖定 · c9d2faed
  宁斌 committed Nov 07, 2020
  
  c9d2faed Browse Files
- 添加skyorder打印類 · 90a3fc05
  宁斌 committed Nov 07, 2020
  
  90a3fc05 Browse Files
06 Nov, 2020 2 commits
- 添加滴滴哆啦A夢框架，skyorder打印二維碼 · 7a38c978
  宁斌 committed Nov 06, 2020
  
  7a38c978 Browse Files
- skyorder打印處理新增哆啦A夢:滴滴開源工具（辅助开发工具、测试效率工具、视觉辅助工具） · 9ca88b20
  宁斌 committed Nov 06, 2020
  
  9ca88b20 Browse Files
04 Nov, 2020 3 commits
- 修改餐廳操作相關類 · 654437d8
  宁斌 committed Nov 04, 2020
  
  654437d8 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 84531caa
  Wyh committed Nov 04, 2020
  
  84531caa Browse Files
- 1、prj查詢頁面最後一條數據重印報錯問題 2、餐牌頁面結構調整，頁面開發 · 04daf44e
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Nov 04, 2020
  04daf44e Browse Files
03 Nov, 2020 1 commit
- 增加skyorder打印頁 · fa4a065d
  宁斌 committed Nov 03, 2020
  
  fa4a065d Browse Files
31 Oct, 2020 5 commits

添加skyokrder打印頁面UI · a1867471
宁斌 committed Oct 31, 2020

a1867471 Browse Files

Merge branch 'youhua' into dev · 6e91dc54

# Conflicts:
#	arms/build.gradle
#	base-module/build.gradle
#	base-module/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/bean/expandInfo/ExpandInfoSetting.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/bean/expandInfo/UIStyleExtendedConfiguration.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/database/bean/Discount.java
#	base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/DiscountDao.java
#	config.gradle
#	delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/ui/activity/SendOrderActivity.java
#	order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/discount/OrderDiscount.java
#	print-module/src/main/java/com/joe/print/mvp/print/PrinterRoot.java
#	print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintTestActivity.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/MealStandModel.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderContentModel.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/cart/ShoppingCart.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/discount/NomalDiscount.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/SelectMealAdapter.java

committed Oct 31, 2020

6e91dc54 Browse Files

Merge branch 'master' into dev · 8366fd1e
宁斌 committed Oct 31, 2020

8366fd1e Browse Files
引入rxjava工具類 · ce4cd6d7
宁斌 committed Oct 31, 2020

ce4cd6d7 Browse Files
Merge remote-tracking branch 'origin/dev' into dev · 4cce725c
Wyh committed Oct 31, 2020

4cce725c Browse Files