存酒备注和存酒人

@@ -175,11 +175,14 @@ class WineManageSunModel {
   String wineAmount;
   String unit;
   String wineNumber;
+  String remark;
+  String wineSave;
   List<UploadImgModel> img = [];
   TextEditingController wineNameC = TextEditingController(); //酒品名称
   TextEditingController wineNumC = TextEditingController(); //存酒数量
   TextEditingController wineUnitC = TextEditingController(); //计量单位
   TextEditingController wineSerialC = TextEditingController(); //存酒编号
+  TextEditingController wineRemarkC = TextEditingController(); //存酒备注
   String wineStock;
 
   String cdate;
@@ -194,19 +197,25 @@ class WineManageSunModel {
       this.wineAmount,
       this.unit,
       this.wineNumber,
+      this.remark,
+      this.wineSave,
       this.img,
       this.wineStock,
       this.cdate});
 
   WineManageSunModel.fromJson(Map<String, dynamic> json) {
     wineName = json['wine_name'];
-    wineAmount = double.parse(json['wine_amount'] == '' || json['wine_amount'] == null
+    wineAmount = double.parse(
+            json['wine_amount'] == '' || json['wine_amount'] == null
                 ? '0'
                 : json['wine_amount'])
-            .toInt()
-            .toString();
+        .toInt()
+        .toString();
     unit = json['unit'];
-    wineNumber = json['wine_number']?? "";
+    wineNumber = json['wine_number'] ?? "";
+    remark = json['remark'] ?? '';
+    wineSave = json['wine_save'] ?? '';
+
     // wineStock = json['wine_stock'] ?? "";
     wineStock = double.parse(
             json['wine_stock'] == '' || json['wine_stock'] == null
@@ -243,6 +252,9 @@ class WineManageSunModel {
     data['wine_amount'] = this.wineAmount;
     data['unit'] = this.unit;
     data['wine_number'] = this.wineNumber;
+    data['remark'] = this.remark;
+    data['wine_save'] = this.wineSave;
+
     data['img'] = this.img;
     data['wine_stock'] = this.wineStock;
     data['cdate'] = this.cdate;
@@ -256,6 +268,8 @@ class WineManageSunMoveModel {
   String wineAmount;
   String unit;
   String wineNumber;
+  String remark;
+  String wineSave;
   List<String> img;
   String checkAmount;
   String wineStock;
@@ -275,6 +289,8 @@ class WineManageSunMoveModel {
       this.wineAmount,
       this.unit,
       this.wineNumber,
+      this.remark,
+      this.wineSave,
       this.checkAmount,
       this.img,
       this.wineStock,
@@ -291,6 +307,9 @@ class WineManageSunMoveModel {
     // wineNumC.text = wineAmount ?? '';
     unit = json['unit'];
     wineNumber = json['wine_number'] ?? "";
+    remark = json['remark'] ?? '';
+
+    wineSave = json['wine_save'] ?? '';
     // checkAmount = json['check_amount'] ?? '';
     checkAmount = double.parse(
             json['check_amount'] == '' || json['check_amount'] == null
@@ -329,6 +348,9 @@ class WineManageSunMoveModel {
     data['wine_amount'] = this.wineAmount;
     data['unit'] = this.unit;
     data['wine_number'] = this.wineNumber;
+    data['remark'] = this.remark;
+    data['wine_save'] = this.wineSave;
+
     data['check_amount'] = this.checkAmount;
     data['img'] = this.img;
     data['wine_stock'] = this.wineStock;
@@ -342,12 +364,15 @@ class WineCheckModel {
   String wineName;
   String unit;
   String wineNumber;
+  String remark;
+  String wineSave;
   List<String> img;
   String checkAmount;
   WineCheckModel({
     this.wineName,
     this.unit,
     this.wineNumber,
+    this.remark,
     this.checkAmount,
     this.img,
   });
@@ -356,6 +381,9 @@ class WineCheckModel {
     wineName = json['wine_name'];
     unit = json['unit'];
     wineNumber = json['wine_number'] ?? "";
+    remark = json['remark'] ?? '';
+
+    wineSave = json['wine_save'] ?? '';
     checkAmount = json['check_amount'] ?? "";
 
     // wineNumC.text = wineNumber;
@@ -379,6 +407,10 @@ class WineCheckModel {
     data['wine_name'] = this.wineName;
     data['unit'] = this.unit;
     data['wine_number'] = this.wineNumber;
+    data['remark'] = this.remark;
+
+    data['wine_save'] = this.wineSave;
+
     data['check_amount'] = this.checkAmount;
     data['img'] = this.img;
     return data;

@@ -311,9 +311,15 @@ class _ApplyOutStoreItemPageState extends State<ApplyOutStoreItemPage> {
           _textWidget('计量单位', widget.wineManageSunModel.unit),
           VEmptyView(16),
           _textWidget('存酒编号', widget.wineManageSunModel.wineNumber),
+          if (widget.wineManageSunModel.remark != '') VEmptyView(16),
+          if (widget.wineManageSunModel.remark != '')
+            _textWidget('备注信息', widget.wineManageSunModel.remark),
           VEmptyView(16),
           _textWidget('存酒日期', cdateStr),
           VEmptyView(16),
+          if (widget.wineManageSunModel.wineSave != '')
+            _textWidget('存酒人', widget.wineManageSunModel.wineSave),
+          if (widget.wineManageSunModel.wineSave != '') VEmptyView(16),
           widget.wineManageSunModel.img == null
               ? SizedBox()
               : _getGridImg(context, widget.wineManageSunModel.img),

@@ -116,6 +116,8 @@ class _ApplyOutStorePageState extends State<ApplyOutStorePage> {
         sunMoveModel.checkAmount = element.checkAmount;
         sunMoveModel.wineNumber = element.wineNumber;
         sunMoveModel.unit = element.unit;
+        sunMoveModel.remark = element.remark;
+        sunMoveModel.wineSave = element.wineSave;
 
         sunMoveModel.img = element.img;
 
@@ -146,6 +148,9 @@ class _ApplyOutStorePageState extends State<ApplyOutStorePage> {
           'unit': element.unit, //单位
           'wine_number': element.wineNumber, //存酒编号
           'wine_stock': '${winestockStr}', //剩余库存,
+          'remark': element.remark,
+          'wine_save': element.wineSave,
+
           'cdate': element.cdate,
           'img': element.img == null || element.img.length == 0
               ? null
@@ -223,7 +228,8 @@ class _ApplyOutStorePageState extends State<ApplyOutStorePage> {
   @override
   Widget build(BuildContext context) {
     storeWineProvider = Provider.of<StoreWineProvider>(context, listen: true);
-    menuManageProvider = Provider.of<MenuManageProvider>(context, listen: false);
+    menuManageProvider =
+        Provider.of<MenuManageProvider>(context, listen: false);
     return KeyboardDismissOnTap(
         child: Scaffold(
             appBar: SystemAppBar(
@@ -399,7 +405,8 @@ class _ApplyOutStorePageState extends State<ApplyOutStorePage> {
                                   context, modelTemp);
                             } else {
                               //直接出库
-                              DialogUtil.cupertinoAlertDialog(context,title: '',
+                              DialogUtil.cupertinoAlertDialog(context,
+                                  title: '',
                                   content: '确定要取出当前酒品么?', rCallback: () {
                                 //确定
                                 _outWine(modelTemp);

@@ -636,6 +636,15 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> {
                           'cdate': cdate,
                           'img':
                               images.length == 0 ? null : json.encode(images),
+                          'remark': element.wineRemarkC.text,
+                          'wine_save':
+                              Provider.of<UserModel>(context, listen: false)
+                                      .user
+                                      .nickName ??
+                                  Provider.of<UserModel>(context, listen: false)
+                                      .user
+                                      .account ??
+                                  ''
                         };
                         data.add(map);
                       });

@@ -168,7 +168,10 @@ class _CreateWineItemPageState extends State<CreateWineItemPage> {
           _textFieldWidget(
               '存酒编号', '点击输入存酒编号', widget.wineManageSunModel.wineSerialC,
               keyboardType: TextInputType.numberWithOptions(decimal: true)),
+      
           VEmptyView(16),
+          _textFieldWidget(
+              '备注信息', '点击输入备注', widget.wineManageSunModel.wineRemarkC),
           Consumer<UploadImageProvider>(builder: (context, model, _) {
             return ImgPickerWidget(
               scrollController: widget.controller,

@@ -156,9 +156,14 @@ class _OutStoreRecordItemPageState extends State<OutStoreRecordItemPage> {
           _textWidget('计量单位', widget.wineCheckModel.unit),
           VEmptyView(16),
           _textWidget('存酒编号', widget.wineCheckModel.wineNumber),
+          if (widget.wineCheckModel.remark != '') VEmptyView(16),
+          if (widget.wineCheckModel.remark != '')
+            _textWidget('备注信息', widget.wineCheckModel.remark),
           VEmptyView(16),
           _textWidget('出库日期', widget.cdate),
           VEmptyView(16),
+          _textWidget('存酒人', widget.wineCheckModel.wineSave),
+          VEmptyView(16),
           widget.wineCheckModel.img != null &&
                   widget.wineCheckModel.img.length > 0
               ? _getGridImg(context, widget.wineCheckModel.img)

@@ -235,6 +235,8 @@ class _SmsCodeInputPageState extends State<SmsCodeInputPage> {
                       sunMoveModel.checkAmount = element.checkAmount;
                       sunMoveModel.wineNumber = element.wineNumber;
                       sunMoveModel.unit = element.unit;
+                      sunMoveModel.remark = element.remark;
+                      sunMoveModel.wineSave = element.wineSave;
 
                       sunMoveModel.img = element.img;
 
@@ -270,6 +272,8 @@ class _SmsCodeInputPageState extends State<SmsCodeInputPage> {
                         'wine_amount': element.wineAmount, //初始存酒量
                         'unit': element.unit, //单位
                         'wine_number': element.wineNumber, //存酒编号
+                        'remark': element.remark,
+                        'wine_save': element.wineSave,
                         'wine_stock': '${winestockStr}', //剩余库存,
                         'cdate': element.cdate,
                         'img': element.img == null || element.img.length == 0

@@ -162,8 +162,13 @@ class _WineDetailItemPageState extends State<WineDetailItemPage> {
           VEmptyView(16),
           _textWidget('存酒编号', widget.wineManageSunModel.wineNumber),
           VEmptyView(16),
+          if (widget.wineManageSunModel.remark != '')
+            _textWidget('备注信息', widget.wineManageSunModel.remark),
+          if (widget.wineManageSunModel.remark != '') VEmptyView(16),
           _textWidget('存酒日期', widget.wineManageSunModel.cdate),
-          VEmptyView(16),
+  VEmptyView(16),
+               if(widget.wineManageSunModel.wineSave!='')   _textWidget('存酒人', widget.wineManageSunModel.wineSave),
+               if(widget.wineManageSunModel.wineSave!='')   VEmptyView(16),
           images.length > 0 ? _getGridImg(context, images) : SizedBox(),
           images.length > 0 ? VEmptyView(16) : SizedBox(),
         ],

@@ -8317,7 +8317,10 @@ class DialogUtil {
                       color: rColor)),
               onPressed: () {
                 Navigator.of(context).pop();
-                rCallback();
+                if(rCallback !=null){
+   rCallback();
+                }
+             
               },
             ),
           ],