更新接口1

GeliBusinessPlatform/Model/GoodsManageMoel/GoodsDetailModel.swift

@@ -41,6 +41,7 @@ class GoodsDetailDataModel: Mappable {
     
 }
 class GoodsDetailGoodsResModel: Mappable {
+    var sale_inventory:Int?//可售库存
     var goods_id : Int?  //商品id
     var goods_name : String?  //商品名
     var keywords : String? //关键字
@@ -83,6 +84,7 @@ class GoodsDetailGoodsResModel: Mappable {
     }
     func mapping(map: Map) {
         goods_id <- map["goods_id"]
+        sale_inventory <- map["sale_inventory"]
         goods_name <- map["goods_name"]
         cat_id <- map["cat_id"]
         brand_id <- map["brand_id"]
@@ -140,12 +142,13 @@ class GoodsDetailSkuResModel: Mappable {
     var is_adsale_tiered : Int?  //是否开启预售阶梯价 1开启 0关闭
     var original_price : String?  //原价
     var origin_number_sku : Int?  //起售数量
-
+    var bar_code:String?//商品条码
     required init?( map: Map) {
         
     }
     func mapping(map: Map) {
         sku_id <- map["sku_id"]
+        bar_code <- map["bar_code"]
         price <- map["price"]
         pack_attr <- map["pack_attr"]
         refrigerate <- map["refrigerate"]

GeliBusinessPlatform/Model/VendorModel/VendorListModel.swift

@@ -36,19 +36,21 @@ class VendorListDataModel: Mappable {
     var contacts_name:String? //联系人
     var contacts_phone : String?   //联系人电话
     var contacts_mobile : String?    //联系人手机号
-    var zhizhao : String?   //营业执照
-    var food_production_license : String?   //食品流通许可证
+    var zhizhao : Array<String>?   //营业执照
+    var food_production_license : Array<String>?   //食品流通许可证
     var payable_money : String?   //详细地址
     var is_delete : Int?
     var p_cn : String?   //省
     var c_cn : String?  //市
     var d_cn : String?   //区
-
+    var unit_credit_code:String?//信用代码
+    
     required init?( map: Map) {
         
     }
     func mapping(map: Map) {
         ven_id <- map["ven_id"]
+        unit_credit_code <- map["unit_credit_code"]
         shop_id <- map["shop_id"]
         ven_name <- map["ven_name"]
         province <- map["province"]

GeliBusinessPlatform/ViewController/供应商管理/GYSListViewController.swift

@@ -195,6 +195,7 @@ class GYSListViewController: BaseViewController,UITableViewDataSource,UITableVie
             if data.contacts_phone != nil {
                 vc.telNum = data.contacts_phone!
             }
+            vc.create_number = data.unit_credit_code!
             vc.ven_id = data.ven_id!
             vc.nameStr = data.contacts_name!
             vc.phoneNum = data.contacts_mobile!

GeliBusinessPlatform/ViewController/供应商管理/GYSListViewController.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>

GeliBusinessPlatform/ViewController/商品详情/EPViewController.swift

@@ -556,7 +556,10 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             //是否有封面图
             self.singleImgArr = [ (model.data?.goods_res!.original_img)!]//单张图
             self.original_img = (model.data?.goods_res!.original_img)!
-            
+            if model.data?.goods_res?.sale_inventory != nil {
+                self.tishixxArr.insert(StringByInt(number: (model.data?.goods_res?.sale_inventory)!), at: 4)
+                self.tishixxArr.remove(at: 5)
+            }
             
             //商品规格
             if (model.data?.sku_res?.count)! > 0{
@@ -601,6 +604,9 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
                     
                     //百分比
                     data.DJBiLi = StringByInt(number: dataSource.pct!)
+                    if dataSource.bar_code != nil {
+                        data.bar_code = dataSource.bar_code!
+                    }
                     //阶梯价
                     if dataSource.tiered_pri!.count > 0 {
                         data.jieTiArr = self.getResponseArr(str: dataSource.tiered_pri!)
@@ -846,9 +852,10 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
                     
                     dict = guiGeArr.first
                 }
+                
                 cell.code_lbl.text = "商品条码：未记录"
-                if dict.code_number.count > 0 {
-                    cell.code_lbl.text = "商品条码：\(dict.code_number)"
+                if dict.bar_code.count > 0 {
+                    cell.code_lbl.text = "商品条码：\(dict.bar_code)"
                 }
                 cell.tempLbl.text = "温藏：未记录"
                 if dict.wenDu.count > 0 {
@@ -1804,6 +1811,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             var sku = ["sku_sn":"",
                        "sku_id":item.sku_id,
                        "goods_id":goods_id,
+                       "bar_code":item.bar_code,
                        "is_del":0,
                        "spec_id":"1",
                        "attr":item.guiGe,
@@ -1853,6 +1861,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
                 let sku = ["sku_sn":"",
                            "sku_id":skuModel.sku_id as Any,
                            "goods_id":goods_id as Any,
+                           "bar_code":skuModel.bar_code as Any,
                            "is_del":1,
                            "spec_id":"1",
                            "attr":strattr as Any,
@@ -2091,6 +2100,9 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
                                 }
                             }
                         }
+                    }else{
+                        provinceIndex = 0
+                        cityIndex = 0
                     }
                     proDict = addressArray[provinceIndex] as! Dictionary<String,Any>
 //                }

GeliBusinessPlatform/ViewController/商品详情/ProductDetailViewController.swift

@@ -418,8 +418,8 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
                     dict = guiGeArr.first
                 }
                 cell.code_lbl.text = "商品条码：未记录"
-                if dict.code_number.count > 0 {
-                    cell.code_lbl.text = "商品条码：\(dict.code_number)"
+                if dict.bar_code.count > 0 {
+                    cell.code_lbl.text = "商品条码：\(dict.bar_code)"
                 }
                 cell.tempLbl.text = "温藏：未记录"
                 if dict.wenDu.count > 0 {
@@ -1323,6 +1323,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
             
             var sku = ["sku_sn":"",
                        "spec_id":"1",
+                       "bar_code":md.bar_code,
                        "attr":md.guiGe,
                        "pack_attr":packAttrStr,
                        "refrigerate":md.wenDu,
@@ -1500,6 +1501,9 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
                                 }
                             }
                         }
+                    }else{
+                        provinceIndex = 0
+                        cityIndex = 0
                     }
                     proDict = addressArray[provinceIndex] as! Dictionary<String,Any>
 //                }

GeliBusinessPlatform/ViewController/地址管理/XinZengDiZhiViewController.swift

@@ -187,6 +187,10 @@ class XinZengDiZhiViewController: BaseViewController,UITableViewDelegate,UITable
                                 }
                             }
                         }
+                    }else{
+                        provinceIndex = 0
+                        cityIndex = 0
+                        areaIndex = 0
                     }
                 }
             }

GeliBusinessPlatform/ViewController/打印订单/PrintViewController.swift

@@ -326,6 +326,10 @@ class PrintViewController: BaseViewController,UITableViewDelegate,UITableViewDat
                                 }
                             }
                         }
+                    }else{
+                        provinceIndex = 0
+                        cityIndex = 0
+                        areaIndex = 0
                     }
                     proDict = addressArray[provinceIndex] as! Dictionary<String,Any>
 //                }

GeliBusinessPlatform/ViewController/新增规格/CreatNewSpecsViewController.swift

@@ -237,7 +237,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
         dataModel.price = price
         dataModel.guiGe = guiGe
         dataModel.weight = weight
-        dataModel.code_number = code_number
+        dataModel.bar_code = code_number
         dataModel.wenDu = wenDu
         dataModel.danWei = danWei
         dataModel.isYsJieTiOpen = isYsJieTiOpen
@@ -812,7 +812,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
         price = dataDict.price
         guiGe = dataDict.guiGe
         weight = dataDict.weight
-        code_number = dataDict.code_number
+        code_number = dataDict.bar_code
         wenDu = dataDict.wenDu
         danWei = dataDict.danWei
         yuShouPrice = dataDict.yuShouPrice

GeliBusinessPlatform/ViewController/新增规格/GuiGeModel.swift

@@ -18,7 +18,7 @@ class GuiGeModel: NSObject {
     ///重量
     var weight : String = ""
     ///条形码
-    var code_number : String = ""
+    var bar_code:String = ""
     ///温度
     var wenDu : String = ""
     ///单位