asdfadfafdasdfas

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -353,6 +353,8 @@
 		E0AD92FA2550FD1500D82C17 /* GYS_FX_SearchViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0AD92F82550FD1500D82C17 /* GYS_FX_SearchViewController.xib */; };
 		E0AF740225FB16BA006AA336 /* queryStore_model.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0AF740125FB16BA006AA336 /* queryStore_model.swift */; };
 		E0AF740A25FB1747006AA336 /* queryStoreInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0AF740925FB1747006AA336 /* queryStoreInterface.swift */; };
+		E0AFE970261D45AF00BD2A74 /* NonSelectPiCi_View.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0AFE96F261D45AF00BD2A74 /* NonSelectPiCi_View.swift */; };
+		E0AFE975261D45BA00BD2A74 /* NonSelectPiCi_View.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0AFE974261D45BA00BD2A74 /* NonSelectPiCi_View.xib */; };
 		E0B28DAC24D3B15E00997C69 /* HuoLaLaDiZhiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B28DAA24D3B15E00997C69 /* HuoLaLaDiZhiCell.swift */; };
 		E0B28DAD24D3B15E00997C69 /* HuoLaLaDiZhiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0B28DAB24D3B15E00997C69 /* HuoLaLaDiZhiCell.xib */; };
 		E0B5307E247266F400FFCC15 /* DKXDAdrCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0B5307C247266F400FFCC15 /* DKXDAdrCell.swift */; };
@@ -1139,6 +1141,8 @@
 		E0AD92F82550FD1500D82C17 /* GYS_FX_SearchViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GYS_FX_SearchViewController.xib; sourceTree = "<group>"; };
 		E0AF740125FB16BA006AA336 /* queryStore_model.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = queryStore_model.swift; sourceTree = "<group>"; };
 		E0AF740925FB1747006AA336 /* queryStoreInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = queryStoreInterface.swift; sourceTree = "<group>"; };
+		E0AFE96F261D45AF00BD2A74 /* NonSelectPiCi_View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NonSelectPiCi_View.swift; sourceTree = "<group>"; };
+		E0AFE974261D45BA00BD2A74 /* NonSelectPiCi_View.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NonSelectPiCi_View.xib; sourceTree = "<group>"; };
 		E0B28DAA24D3B15E00997C69 /* HuoLaLaDiZhiCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HuoLaLaDiZhiCell.swift; sourceTree = "<group>"; };
 		E0B28DAB24D3B15E00997C69 /* HuoLaLaDiZhiCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HuoLaLaDiZhiCell.xib; sourceTree = "<group>"; };
 		E0B5307C247266F400FFCC15 /* DKXDAdrCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DKXDAdrCell.swift; sourceTree = "<group>"; };
@@ -3532,6 +3536,8 @@
 				F97E73312552A22000A11F98 /* DistributorSettingAlertView.xib */,
 				E0F038FB2599C5F500721011 /* GLTimeSelectView.swift */,
 				E0F039002599C60200721011 /* GLTimeSelectView.xib */,
+				E0AFE96F261D45AF00BD2A74 /* NonSelectPiCi_View.swift */,
+				E0AFE974261D45BA00BD2A74 /* NonSelectPiCi_View.xib */,
 			);
 			path = AlertView;
 			sourceTree = "<group>";
@@ -3934,6 +3940,7 @@
 				E0239203249069FD00C4C632 /* CGDXQVc.xib in Resources */,
 				F9B9FAC824DE409300ACDC8F /* UpBillDataTableViewCell.xib in Resources */,
 				E042F73D245288F800CDFA12 /* WenDuCell.xib in Resources */,
+				E0AFE975261D45BA00BD2A74 /* NonSelectPiCi_View.xib in Resources */,
 				E0974D6D25C140A600E3C86B /* S_Y_Detail_Vc.xib in Resources */,
 				E02DDD92244FE55400ABB707 /* NewCreateHeader.xib in Resources */,
 				F9956B1C2463D941001A617D /* WorkSelectTimeView.xib in Resources */,
@@ -4453,6 +4460,7 @@
 				E0DA8AAA25E8F3D800425099 /* HLBLEManager.m in Sources */,
 				E0273DDD24551D4500B3FCAE /* OnlyLabelCell.swift in Sources */,
 				F950FDD724518B9500C40530 /* FSCalendarCollectionView.m in Sources */,
+				E0AFE970261D45AF00BD2A74 /* NonSelectPiCi_View.swift in Sources */,
 				E077DC5F255124B8000B0DA5 /* GYS_HZ_Vc.swift in Sources */,
 				E02C88262456B24F00925766 /* WuLiuGenZongViewController.swift in Sources */,
 				E09B03C62445BF6700211A51 /* NavBarView.swift in Sources */,

GeliBusinessPlatform/AppDelegate.swift

@@ -282,8 +282,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate,UITabBarCont
         
         let v2 = GoodsManageListVC()
         
-        let v3 = WorkCViewController()
-//        let v3 = CZ_Vc()
+//        let v3 = WorkCViewController()
+        let v3 = P_P_H_Adr_VC()
         
         let v4 = WarehoseMangementListVC()
         

GeliBusinessPlatform/View/AlertView/GeliAltetCodeView.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" 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="16087"/>
+        <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"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -62,7 +63,7 @@
                             </constraints>
                         </imageView>
                     </subviews>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
                         <constraint firstItem="U7V-00-9eL" firstAttribute="centerX" secondItem="dR0-fY-HSt" secondAttribute="centerX" id="J1f-XI-0a7"/>
                         <constraint firstItem="3UA-fV-YPC" firstAttribute="top" secondItem="dR0-fY-HSt" secondAttribute="top" constant="15" id="Qig-rb-5VD"/>
@@ -84,6 +85,7 @@
                     </userDefinedRuntimeAttributes>
                 </view>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="H1b-gu-ySU"/>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstItem="dR0-fY-HSt" firstAttribute="centerY" secondItem="YjS-pf-BSo" secondAttribute="centerY" constant="-50" id="Ip1-Ql-Las"/>
@@ -93,7 +95,6 @@
                 <constraint firstItem="1xk-Rr-MEN" firstAttribute="leading" secondItem="YjS-pf-BSo" secondAttribute="leading" id="oU0-wa-Eqf"/>
                 <constraint firstAttribute="trailing" secondItem="1xk-Rr-MEN" secondAttribute="trailing" id="tGm-8y-zbR"/>
             </constraints>
-            <viewLayoutGuide key="safeArea" id="H1b-gu-ySU"/>
             <point key="canvasLocation" x="-430" y="100"/>
         </view>
     </objects>
@@ -106,5 +107,8 @@
         <namedColor name="标题字颜色">
             <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>

GeliBusinessPlatform/View/AlertView/NonSelectPiCi_View.swift

+//
+//  NonSelectPiCi_View.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2021/4/7.
+//  Copyright © 2021 junye lu. All rights reserved.
+//
+
+import UIKit
+protocol NonSelectPiCi_View_Delegate {
+    func NonSelectPiCi_View_Submit()
+}
+class NonSelectPiCi_View: UIView {
+
+    var contentView:UIView!
+    var delegate:NonSelectPiCi_View_Delegate?
+    @IBAction func closeAction(_ sender: Any) {
+        self.removeFromSuperview()
+    }
+    
+    @IBAction func submitAction(_ sender: Any) {
+        delegate?.NonSelectPiCi_View_Submit()
+        self.removeFromSuperview()
+    }
+    //初始化时将xib中的view添加进来
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        contentView = loadViewFromNib()
+        addSubview(contentView)
+        contentView.snp.makeConstraints { (make) in
+            make.left.top.right.bottom.equalToSuperview()
+        }
+    }
+    //    /初始化时将xib中的view添加进来
+    required init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+        contentView = loadViewFromNib()
+        addSubview(contentView)
+        contentView.snp.makeConstraints { (make) in
+            make.left.top.right.bottom.equalToSuperview()
+        }
+    }
+    //加载xib
+    func loadViewFromNib() -> UIView {
+        let className = type(of: self)
+        let bundle = Bundle(for: className)
+        let name = NSStringFromClass(className).components(separatedBy: ".").last
+        let nib = UINib(nibName: name!, bundle: bundle)
+        let view = nib.instantiate(withOwner: self, options: nil).first as! UIView
+        return view
+    }
+
+}

GeliBusinessPlatform/ViewController/地图/SJMapViewController.swift

@@ -231,47 +231,6 @@ class SJMapViewController: UIViewController,NavBarViewDelegate,AMapLocationManag
         
     }
     
-    //MARK: - initUI
-    func initUI(){
-        let img = UIImageView()
-        img.image = UIImage(named: "beijing")
-        view.addSubview(img)
-        img.snp.makeConstraints { (make) in
-            make.top.right.left.equalTo(0)
-            make.height.equalTo(200)
-        }
-        
-        let btn = LGButton()
-        btn.titleString = "确定"
-        btn.titleColor = UIColor.white
-        btn.titleFontSize = 13
-        btn.gradientStartColor = UIColor(named: "按钮渐变色上")
-        btn.gradientEndColor = UIColor(named: "按钮渐变色下,字体颜色")
-        btn.gradientHorizontal = true
-        btn.cornerRadius = 3
-        btn.addTarget(self, action: #selector(submitAction), for: .touchUpInside)
-        self.view.addSubview(btn)
-        btn.snp.makeConstraints { (make) in
-            make.top.equalTo(60)
-            make.right.equalTo(-20)
-            make.width.equalTo(60)
-            make.height.equalTo(30)
-        }
-        
-        let btn2 = UIButton()
-        btn2.setTitle("取消", for: .normal)
-        btn2.backgroundColor = UIColor(named: "灰色分界线")
-        btn2.setTitleColor(UIColor(named: "个人中心灰色字体"), for: .normal)
-        btn2.titleLabel?.font = UIFont.systemFont(ofSize: 13)
-        btn2.addTarget(self, action: #selector(backAction), for: .touchUpInside)
-        self.view.addSubview(btn2)
-        btn2.snp.makeConstraints { (make) in
-            make.top.equalTo(60)
-            make.left.equalTo(20)
-            make.width.equalTo(60)
-            make.height.equalTo(30)
-        }
-    }
     func initBtmView(view:UIView){
         let tbv = UITableView()
         tbv.separatorStyle = .none

GeliBusinessPlatform/ViewController/拼拼货group/CZ_Vc.swift

@@ -16,12 +16,12 @@ class CZ_Vc: BaseViewController {
     @IBOutlet weak var bank_name: UILabel!
     @IBOutlet weak var user_account: UILabel!
     @IBAction func copy_action(_ sender: UIButton) {
-//        let pastboard = UIPasteboard.general
-//        pastboard.string = bank_account_number.text
-//        HUD.flash(.success, delay: 0.5)
+        let pastboard = UIPasteboard.general
+        pastboard.string = bank_account_number.text
+        HUD.flash(.success, delay: 0.5)
         
-        let view = P_P_H_Time_Select_View(frame: self.view.bounds)
-        self.view.addSubview(view)
+//        let view = P_P_H_Time_Select_View(frame: self.view.bounds)
+//        self.view.addSubview(view)
     }
     override func viewDidLoad() {
         super.viewDidLoad()

GeliBusinessPlatform/ViewController/拼拼货group/P_P_H_Adr_VC.xib

@@ -177,6 +177,9 @@
                                         <constraint firstAttribute="width" constant="60" id="uUx-C1-i6n"/>
                                     </constraints>
                                     <state key="normal" image="Gloc"/>
+                                    <connections>
+                                        <action selector="map_select_loc:" destination="-1" eventType="touchUpInside" id="zwk-BV-FQf"/>
+                                    </connections>
                                 </button>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="地址：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hi6-hO-U5J">
                                     <rect key="frame" x="10" y="0.0" width="39" height="49"/>

GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift

@@ -11,7 +11,17 @@ import Photos
 protocol OrderDViewControllerDelegate {
     func refishingOrderDchange()
 }
-class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndBtnCellDelegate,GuanLianKehuVCDelegate,OrderDViewFooterViewDelegate,TitleAndTFCellDelegate,GeliAlertViewDelegate,GLAlertSelectViewDelegate,XiuGaiYuShouJiaViewControllerDelegate,ChangeGoodsPriceVCDelegate,GeliAlertTextFiledDelegate,GeliAlertTextViewDelegate,UpBillDataTableViewCellDelegate, DaiKeXiaDanGouWuCellDelegate, S_Y_View_Delegate, PiCiXuanZeViewControllerDelegate1{
+class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndBtnCellDelegate,GuanLianKehuVCDelegate,OrderDViewFooterViewDelegate,TitleAndTFCellDelegate,GeliAlertViewDelegate,GLAlertSelectViewDelegate,XiuGaiYuShouJiaViewControllerDelegate,ChangeGoodsPriceVCDelegate,GeliAlertTextFiledDelegate,GeliAlertTextViewDelegate,UpBillDataTableViewCellDelegate, DaiKeXiaDanGouWuCellDelegate, S_Y_View_Delegate, PiCiXuanZeViewControllerDelegate1,NonSelectPiCi_View_Delegate{
+    func NonSelectPiCi_View_Submit() {
+        sendOut(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any,"goods_info":[] as Any], success: { (data) in
+            HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
+            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
+            self.delegate?.refishingOrderDchange()
+            self.loadData()
+        }) { (error) in
+            
+        }
+    }
     
     var piCiArr:Array<Array<GetGoodBatchDataModel>>? = []
     func PiCiXuanZeViewControllerPiCiSelect(data: Array<GetGoodBatchDataModel>, p_id: Int) {
@@ -1631,6 +1641,56 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             self.view.window?.addSubview(alertView)
             break
         case "发货":
+            piciData = ""
+            var goodsInfoArr:Array<Any> = []
+            for i in 0 ..< (dataMdoel?.order_goods?.count)! {
+                let item = dataMdoel?.order_goods![i]
+                var count = 0
+                
+                let pici = piCiArr![i]
+                if pici.count == 0 {
+                    HUD.flash(.label("请选择出库商品批次"), delay: 1.2)
+                    let vc = NonSelectPiCi_View(frame: self.view.bounds)
+                    vc.delegate = self
+                    self.view.window?.addSubview(vc)
+                    return
+                }
+                
+                for data in pici {
+                    count += data.chuHuoLiang!
+                }
+                
+                var batchInfo:Array<Any> = []
+                piCiArr!.forEach { (batchArr) in
+                    batchArr.forEach { (model) in
+                        let batch = [
+                            "w_id":model.w_id as Any,
+                            "p_id":model.p_id as Any,
+                            "number":model.chuHuoLiang as Any,
+                            "production_data":model.production_data as Any,
+                            "shelf_life":model.shelf_life as Any,
+                            "valid_date":model.valid_date as Any,
+                            "batch_id":model.batch_id as Any,
+                            "report_id":model.report_id as Any,
+                            "ven_id":model.ven_id as Any
+                        ]
+                        batchInfo.append(batch)
+                    }
+                }
+                
+                let goods = [
+                    "goods_id":item!.goods_id as Any,
+                    "goods_name":item!.goods_name as Any,
+                    "goods_spec":item!.goods_attr as Any,
+                    "sku_id":item!.sku_id as Any,
+                    "number":count as Any,
+                    "batch_info":batchInfo as Any,
+                ]
+                goodsInfoArr.append(goods)
+            }
+            piciData = dataChangeString(sender: goodsInfoArr)
+            
+            
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
             alertView.delegate = self;
             alertView.tishiLbl.text = ""
@@ -1803,6 +1863,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
     }
     //MARK:--确认和取消订单
     //MARK:--弹窗代理 --还有其他弹窗，根据tag分类
+    var piciData = ""
     func sureGeliAlertViewAction(sender: UIButton) {
         
         if sender.tag == 1001 {
@@ -1840,51 +1901,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
                     
                 }
             }else{
-                var goodsInfoArr:Array<Any> = []
-                for i in 0 ..< (dataMdoel?.order_goods?.count)! {
-                    let item = dataMdoel?.order_goods![i]
-                    var count = 0
-                    
-                    let pici = piCiArr![i]
-                    if pici.count == 0 {
-                        HUD.flash(.label("请选择出库商品批次"), delay: 1.2)
-                        return
-                    }
-                    
-                    for data in pici {
-                        count += data.chuHuoLiang!
-                    }
-                    
-                    var batchInfo:Array<Any> = []
-                    piCiArr!.forEach { (batchArr) in
-                        batchArr.forEach { (model) in
-                            let batch = [
-                                "w_id":model.w_id as Any,
-                                "p_id":model.p_id as Any,
-                                "number":model.chuHuoLiang as Any,
-                                "production_data":model.production_data as Any,
-                                "shelf_life":model.shelf_life as Any,
-                                "valid_date":model.valid_date as Any,
-                                "batch_id":model.batch_id as Any,
-                                "report_id":model.report_id as Any,
-                                "ven_id":model.ven_id as Any
-                            ]
-                            batchInfo.append(batch)
-                        }
-                    }
-                    
-                    let goods = [
-                        "goods_id":item!.goods_id as Any,
-                        "goods_name":item!.goods_name as Any,
-                        "goods_spec":item!.goods_attr as Any,
-                        "sku_id":item!.sku_id as Any,
-                        "number":count as Any,
-                        "batch_info":batchInfo as Any,
-                    ]
-                    goodsInfoArr.append(goods)
-                }
-                
-                sendOut(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any,"goods_info":dataChangeString(sender: goodsInfoArr) as Any], success: { (data) in
+                sendOut(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any,"goods_info":piciData as Any], success: { (data) in
                     HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
                     NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
                     self.delegate?.refishingOrderDchange()