Skip to content

G
GeliBusinessPlatform
Commit 21ea9098 authored by lujunye's avatar lujunye
Browse files
Options

入库完成

parent 34ed0b8a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 402 additions and 25 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 21ea9098
......@@ -32,6 +32,8 @@
E013D78D2484CAFC0092DE46 /* CRKBtnCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E013D78B2484CAFC0092DE46 /* CRKBtnCell.xib */; };
E013D7902484D5AF0092DE46 /* NewCKCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E013D78E2484D5AF0092DE46 /* NewCKCell.swift */; };
E013D7912484D5AF0092DE46 /* NewCKCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E013D78F2484D5AF0092DE46 /* NewCKCell.xib */; };
E0190A2D2487696F00B1E067 /* NewSelectItemVc.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0190A2B2487696F00B1E067 /* NewSelectItemVc.swift */; };
E0190A2E2487696F00B1E067 /* NewSelectItemVc.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0190A2C2487696F00B1E067 /* NewSelectItemVc.xib */; };
E01C26B12446989700ADCC70 /* Interface_Z.plist in Resources */ = {isa = PBXBuildFile; fileRef = E01C26B02446989700ADCC70 /* Interface_Z.plist */; };
E01C26B62446AF3100ADCC70 /* DemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E01C26B42446AF3100ADCC70 /* DemoViewController.swift */; };
E01C26B72446AF3100ADCC70 /* DemoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E01C26B52446AF3100ADCC70 /* DemoViewController.xib */; };
......@@ -292,6 +294,8 @@
E0E341EA246E95EE0060AC20 /* PingLunCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0E341E8246E95EE0060AC20 /* PingLunCell.swift */; };
E0E341EB246E95EE0060AC20 /* PingLunCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0E341E9246E95EE0060AC20 /* PingLunCell.xib */; };
E0E8ABFD246E359700E3BB54 /* GuiGeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0E8ABFC246E359700E3BB54 /* GuiGeModel.swift */; };
E0EABAE72487748500F6CA8D /* NewSelectWarehouseVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0EABAE52487748500F6CA8D /* NewSelectWarehouseVC.swift */; };
E0EABAE82487748500F6CA8D /* NewSelectWarehouseVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0EABAE62487748500F6CA8D /* NewSelectWarehouseVC.xib */; };
E0F1BE4824692379003015B2 /* ItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0F1BE4624692379003015B2 /* ItemCell.swift */; };
E0F1BE4924692379003015B2 /* ItemCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0F1BE4724692379003015B2 /* ItemCell.xib */; };
E0F3C2CB24590C86006F0D1F /* XinZengAndBianJiKeHuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0F3C2C924590C86006F0D1F /* XinZengAndBianJiKeHuViewController.swift */; };
......@@ -545,6 +549,8 @@
E013D78B2484CAFC0092DE46 /* CRKBtnCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CRKBtnCell.xib; sourceTree = "<group>"; };
E013D78E2484D5AF0092DE46 /* NewCKCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewCKCell.swift; sourceTree = "<group>"; };
E013D78F2484D5AF0092DE46 /* NewCKCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NewCKCell.xib; sourceTree = "<group>"; };
E0190A2B2487696F00B1E067 /* NewSelectItemVc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewSelectItemVc.swift; sourceTree = "<group>"; };
E0190A2C2487696F00B1E067 /* NewSelectItemVc.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NewSelectItemVc.xib; sourceTree = "<group>"; };
E01C26B02446989700ADCC70 /* Interface_Z.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Interface_Z.plist; sourceTree = "<group>"; };
E01C26B42446AF3100ADCC70 /* DemoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoViewController.swift; sourceTree = "<group>"; };
E01C26B52446AF3100ADCC70 /* DemoViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DemoViewController.xib; sourceTree = "<group>"; };
......@@ -814,6 +820,8 @@
E0E341E8246E95EE0060AC20 /* PingLunCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PingLunCell.swift; sourceTree = "<group>"; };
E0E341E9246E95EE0060AC20 /* PingLunCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PingLunCell.xib; sourceTree = "<group>"; };
E0E8ABFC246E359700E3BB54 /* GuiGeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuiGeModel.swift; sourceTree = "<group>"; };
E0EABAE52487748500F6CA8D /* NewSelectWarehouseVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewSelectWarehouseVC.swift; sourceTree = "<group>"; };
E0EABAE62487748500F6CA8D /* NewSelectWarehouseVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NewSelectWarehouseVC.xib; sourceTree = "<group>"; };
E0F1BE4624692379003015B2 /* ItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemCell.swift; sourceTree = "<group>"; };
E0F1BE4724692379003015B2 /* ItemCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ItemCell.xib; sourceTree = "<group>"; };
E0F3C2C924590C86006F0D1F /* XinZengAndBianJiKeHuViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XinZengAndBianJiKeHuViewController.swift; sourceTree = "<group>"; };
......@@ -1239,6 +1247,32 @@
path = GeliBusinessPlatformUITests;
sourceTree = "<group>";
};
E0190A292487691200B1E067 /* 入库 */ = {
isa = PBXGroup;
children = (
E030DF39248651A5002764D3 /* NewRKVc.swift */,
E030DF3A248651A5002764D3 /* NewRKVc.xib */,
E0F8E919248737F100817A08 /* NewOnlyRKCell.swift */,
E0F8E91A248737F100817A08 /* NewOnlyRKCell.xib */,
E0EABAE52487748500F6CA8D /* NewSelectWarehouseVC.swift */,
E0EABAE62487748500F6CA8D /* NewSelectWarehouseVC.xib */,
);
path = "入库";
sourceTree = "<group>";
};
E0190A2A2487692700B1E067 /* 出库 */ = {
isa = PBXGroup;
children = (
E0F8E91D248747D200817A08 /* NewCKVc.swift */,
E0F8E91E248747D200817A08 /* NewCKVc.xib */,
E095C42824874E6100922571 /* CKGmCell.swift */,
E095C42924874E6100922571 /* CKGmCell.xib */,
E095C42424874BDA00922571 /* CKNonGmCell.swift */,
E095C42524874BDA00922571 /* CKNonGmCell.xib */,
);
path = "出库";
sourceTree = "<group>";
};
E01C26B32446AEF800ADCC70 /* DEMO */ = {
isa = PBXGroup;
children = (
......@@ -1345,16 +1379,10 @@
E030DF382486517E002764D3 /* 1.1入库&出库 */ = {
isa = PBXGroup;
children = (
E030DF39248651A5002764D3 /* NewRKVc.swift */,
E030DF3A248651A5002764D3 /* NewRKVc.xib */,
E0F8E919248737F100817A08 /* NewOnlyRKCell.swift */,
E0F8E91A248737F100817A08 /* NewOnlyRKCell.xib */,
E0F8E91D248747D200817A08 /* NewCKVc.swift */,
E0F8E91E248747D200817A08 /* NewCKVc.xib */,
E095C42824874E6100922571 /* CKGmCell.swift */,
E095C42924874E6100922571 /* CKGmCell.xib */,
E095C42424874BDA00922571 /* CKNonGmCell.swift */,
E095C42524874BDA00922571 /* CKNonGmCell.xib */,
E0190A292487691200B1E067 /* 入库 */,
E0190A2A2487692700B1E067 /* 出库 */,
E0190A2B2487696F00B1E067 /* NewSelectItemVc.swift */,
E0190A2C2487696F00B1E067 /* NewSelectItemVc.xib */,
);
path = "1.1入库&出库";
sourceTree = "<group>";
......@@ -2630,6 +2658,7 @@
E0F8E91C248737F100817A08 /* NewOnlyRKCell.xib in Resources */,
E013D7892484B1B90092DE46 /* CRKXiangQVC.xib in Resources */,
E0A409C92464010D00CFF109 /* FirstCell.xib in Resources */,
E0EABAE82487748500F6CA8D /* NewSelectWarehouseVC.xib in Resources */,
E00E48C32457C0D600F16545 /* XuanZeShangPinViewController.xib in Resources */,
F9023F6A2449A50900DD5A63 /* TitleContentCell.xib in Resources */,
F956D5A5246A2D9C003FF510 /* Feature in Resources */,
......@@ -2707,6 +2736,7 @@
E0A7548B244A8F0F00A84B67 /* CheckWareHourseViewController.xib in Resources */,
F956D5A4246A2D9C003FF510 /* .gitignore in Resources */,
E0BE8A80245A740600E80134 /* ChengGongCell.xib in Resources */,
E0190A2E2487696F00B1E067 /* NewSelectItemVc.xib in Resources */,
F95D9B5024484FAE0080D6E3 /* GeliAlertView.xib in Resources */,
E01EA1A1245A5D6B00F019D5 /* YunDanXiangQingViewController.xib in Resources */,
E0BE8A8C245A7D3300E80134 /* BtmBtnCell.xib in Resources */,
......@@ -2829,6 +2859,7 @@
E0A409CC2464026B00CFF109 /* SecondCell.swift in Sources */,
E0BE8A87245A7A1500E80134 /* JiBenXinXiCell.swift in Sources */,
E0DDCB13244ADF2C00DF54C7 /* ChangePriceNormalCell.swift in Sources */,
E0EABAE72487748500F6CA8D /* NewSelectWarehouseVC.swift in Sources */,
F956D5B2246A2D9C003FF510 /* LMNDraft.m in Sources */,
E09B03B62445B85A00211A51 /* LoginViewController.swift in Sources */,
E02FD9FA24557E8600E10E27 /* XinZengDiZhiViewController.swift in Sources */,
......@@ -2877,6 +2908,7 @@
F950FDDB24518B9500C40530 /* FSCalendarStickyHeader.m in Sources */,
E02D586D2477A2D90065A9EB /* EditFtNumberModel.swift in Sources */,
F95A9EE924558B8800867849 /* ShowAlGoodsViewController.swift in Sources */,
E0190A2D2487696F00B1E067 /* NewSelectItemVc.swift in Sources */,
E09B03C32445BD9500211A51 /* NavViewController.swift in Sources */,
F950FDD924518B9500C40530 /* FSCalendarDelegationFactory.m in Sources */,
E0A2E82B24555D8600D6DB34 /* KuCunXiangQingCell.swift in Sources */,
......
GeliBusinessPlatform/AppDelegate.swift
View file @ 21ea9098
......@@ -243,7 +243,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate, UITabBarCon
let v1 = OrderListViewController()
let v2 = GoodsManageListVC()
let v3 = WorkCViewController()
// let v3 = WorkCViewController()
let v4 = WarehoseMangementListVC()
let v5 = PersonCenterViewController()
......
GeliBusinessPlatform/Define/Define.swift
View file @ 21ea9098
......@@ -321,6 +321,15 @@ func getDicFromJSONString(jsonString:String) ->Dictionary<String,Any>{
}
return Dictionary()
}
//MARK: - 获取系统当前时间
func getTimeNow()->String{
let date = Date()
let timeFormatter = DateFormatter()
timeFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
return timeFormatter.string(from: date) as String
}
//MARK:--字典转字符串
func dictChangeString(sender:Dictionary<String, Any>) -> String{
var str = ""
......
GeliBusinessPlatform/Model/WarehouseManageModel/InputInitInfoModel.swift
View file @ 21ea9098
......@@ -12,7 +12,7 @@ import ObjectMapper
class InputInitInfoModel: Mappable {
var code:Int?
var message : String?
var data : Array<InputInitInfoDataModel>?
var data : InputInitInfoDataModel?
required init?( map: Map) {
......@@ -116,6 +116,12 @@ class InputInitInfoGoodsInfoModel: Mappable { //商品信息
var inventory : Int?//可售库存
var warehouse_inventory :Int?//仓储库存
//text:数据 inputType: 100-保质期 101-总价 102-入库数量 103-入库价格
var BZQ:Int?
var ZJ:Float?
var RKSL:Int?
var RKJG:Float?
var DayType:Int = 1
required init?( map: Map) {
......@@ -129,6 +135,11 @@ class InputInitInfoGoodsInfoModel: Mappable { //商品信息
price <- map["price"]
inventory <- map["inventory"]
warehouse_inventory <- map["warehouse_inventory"]
BZQ <- map["BZQ"]
ZJ <- map["ZJ"]
RKSL <- map["RKSL"]
RKJG <- map["RKJG"]
DayType <- map["DayType"]
}
}
......
GeliBusinessPlatform/View/Cell/XuanZeShangPinCell.xib
View file @ 21ea9098
......@@ -2,6 +2,7 @@
<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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
......@@ -299,7 +300,7 @@
<color red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="蓝色字体颜色">
<color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/1.1入库&出库/NewSelectItemVc.swift 0 → 100644
View file @ 21ea9098
//
// NewSelectItemVc.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/6/3.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
protocol NewSelectItemVcDelegate {
func NewSelectItemVcSelect(datas:Array<InputInitInfoGoodsInfoModel>)
}
class NewSelectItemVc: BaseViewController,UITableViewDelegate,UITableViewDataSource{
var rkDatas:Array<InputInitInfoGoodsInfoModel> = []
var rkSelectArr:Array<InputInitInfoGoodsInfoModel> = []
var delegate:NewSelectItemVcDelegate?
@IBAction func submitAction(_ sender: Any) {
delegate?.NewSelectItemVcSelect(datas: rkSelectArr)
self.navigationController?.popViewController(animated: true)
}
@IBOutlet weak var listView: UITableView!
@IBOutlet weak var searchBg: UIView!
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "选择商品"
self.view.addSubview(navbar)
listView.register(UINib(nibName: "XuanZeShangPinCell", bundle: nil), forCellReuseIdentifier: "XuanZeShangPinCell")
listView.separatorStyle = .none
SetTopFrame(view:searchBg,height:0)
// Do any additional setup after loading the view.
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return rkDatas.count
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "XuanZeShangPinCell") as! XuanZeShangPinCell
cell.tag = indexPath.row
let cellData = rkDatas[indexPath.row]
cell.selectBtn.isSelected = false
for item in rkSelectArr {
if item.goods_id == cellData.goods_id {
cell.selectBtn.isSelected = true
}
}
cell.iconImg.sd_setImage(with:URL(string:SERVERCE_ImageHost + cellData.goods_thumb!))
cell.nameLbl.text = cellData.goods_name
cell.detailLbl.text = cellData.spec_str
cell.detailLbl2.text = "\(cellData.inventory!)"
return cell
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return 120
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let data = rkDatas[indexPath.row]
let idx = rkSelectArr.firstIndex { (model) -> Bool in
return model.goods_id == data.goods_id
}
if idx != nil {
rkSelectArr.remove(at: idx!)
}else{
rkSelectArr.append(data)
}
listView.reloadData()
}
}
GeliBusinessPlatform/ViewController/1.1入库&出库/NewSelectItemVc.xib 0 → 100644
View file @ 21ea9098
<?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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="NewSelectItemVc" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="listView" destination="fle-C9-fK3" id="9Om-qE-ckQ"/>
<outlet property="searchBg" destination="Akz-Jf-D61" id="adg-SH-BB9"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YQa-KT-S49" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="0.0" y="813" width="414" height="83"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
<color key="value" name="按钮渐变色上"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="gradientEndColor">
<color key="value" name="按钮渐变色下,字体颜色"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="submitAction:" destination="-1" eventType="touchUpInside" id="P0m-8T-q65"/>
</connections>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BVY-bL-lp9">
<rect key="frame" x="0.0" y="813" width="414" height="49"/>
<constraints>
<constraint firstAttribute="height" constant="49" id="kOP-e7-37f"/>
</constraints>
<attributedString key="attributedText">
<fragment content="确定">
<attributes>
<color key="NSColor" name="白色背景色"/>
<font key="NSFont" size="17" name="PingFangSC-Medium"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
</attributedString>
<nil key="highlightedColor"/>
</label>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="fle-C9-fK3">
<rect key="frame" x="0.0" y="44" width="414" height="769"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<connections>
<outlet property="dataSource" destination="-1" id="w2I-Zt-2JH"/>
<outlet property="delegate" destination="-1" id="VJ1-mC-l5Q"/>
</connections>
</tableView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Akz-Jf-D61">
<rect key="frame" x="0.0" y="44" width="414" height="0.0"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="height" id="Q54-jV-FFR"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="BVY-bL-lp9" secondAttribute="trailing" id="0JN-uh-04k"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="Akz-Jf-D61" secondAttribute="trailing" id="30i-Sw-ZCy"/>
<constraint firstItem="fle-C9-fK3" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="3Qk-5k-Wv2"/>
<constraint firstAttribute="trailing" secondItem="YQa-KT-S49" secondAttribute="trailing" id="5fw-8c-bNa"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="fle-C9-fK3" secondAttribute="trailing" id="6M1-zp-qbk"/>
<constraint firstItem="BVY-bL-lp9" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="7HF-tv-DvK"/>
<constraint firstItem="Akz-Jf-D61" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="9IQ-pL-60x"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="BVY-bL-lp9" secondAttribute="bottom" id="DGr-tx-Emi"/>
<constraint firstItem="YQa-KT-S49" firstAttribute="top" secondItem="fle-C9-fK3" secondAttribute="bottom" id="FmK-hV-T1a"/>
<constraint firstAttribute="bottom" secondItem="YQa-KT-S49" secondAttribute="bottom" id="Q0T-ae-EGB"/>
<constraint firstItem="Akz-Jf-D61" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="V8m-aU-tax"/>
<constraint firstItem="fle-C9-fK3" firstAttribute="top" secondItem="Akz-Jf-D61" secondAttribute="bottom" id="eca-fr-Vpj"/>
<constraint firstItem="YQa-KT-S49" firstAttribute="top" secondItem="BVY-bL-lp9" secondAttribute="top" id="hs4-X7-64m"/>
<constraint firstItem="YQa-KT-S49" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="lsF-py-5BP"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<point key="canvasLocation" x="131.8840579710145" y="123.88392857142857"/>
</view>
</objects>
<resources>
<namedColor name="按钮渐变色上">
<color red="0.3880000114440918" green="0.62400001287460327" blue="0.90200001001358032" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="按钮渐变色下,字体颜色">
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="白色背景色">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/1.1入库&出库/NewOnlyRKCell.swift → GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewOnlyRKCell.swift
View file @ 21ea9098
......@@ -37,11 +37,11 @@ class NewOnlyRKCell: UITableViewCell,UITextFieldDelegate {
bzqTf.delegate = self
bzqTf.tag = 100
totalPriceTf.delegate = self
bzqTf.tag = 101
totalPriceTf.tag = 101
rkCountTf.delegate = self
bzqTf.tag = 102
rkCountTf.tag = 102
rkPriceTf.delegate = self
bzqTf.tag = 103
rkPriceTf.tag = 103
setYuanJiao2(sender: leftBtn)
setYuanJiao(sender: rightBtn)
......
GeliBusinessPlatform/ViewController/1.1入库&出库/NewRKVc.xib → GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewRKVc.xib
View file @ 21ea9098
......@@ -23,11 +23,11 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="laH-6h-Yuu">
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="laH-6h-Yuu">
<rect key="frame" x="0.0" y="813" width="414" height="83"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Y16-6N-pRK">
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Y16-6N-pRK">
<rect key="frame" x="0.0" y="813" width="414" height="49"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DkD-m0-Phd">
......@@ -82,7 +82,7 @@
<outlet property="delegate" destination="-1" id="qQp-u4-XGg"/>
</connections>
</tableView>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Zg-yA-Y0g" customClass="LGButton" customModule="LGButton">
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Zg-yA-Y0g" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="0.0" y="813" width="414" height="83"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<userDefinedRuntimeAttributes>
......@@ -98,7 +98,7 @@
<action selector="gmAction:" destination="-1" eventType="touchUpInside" id="G4f-wv-AcH"/>
</connections>
</view>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="直接入库" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OXL-LJ-d3p">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="提交申请" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OXL-LJ-d3p">
<rect key="frame" x="0.0" y="813" width="414" height="49"/>
<constraints>
<constraint firstAttribute="height" constant="49" id="tvW-rk-iXN"/>
......
GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewSelectWarehouseVC.swift 0 → 100644
View file @ 21ea9098
//
// NewSelectWarehouseVC.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/6/3.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
protocol NewSelectWarehouseVCDelegate {
func NewSelectWarehouseVCFinish(kuWeiArr:Array<ShopWarehouseDetailDataPositionModel>,data:InputInitInfoWareHouseResModel)
}
class NewSelectWarehouseVC: BaseViewController ,UITableViewDelegate,UITableViewDataSource{
var delegate:NewSelectWarehouseVCDelegate?
var rkWareHouseArr:Array<InputInitInfoWareHouseResModel> = []
@IBOutlet weak var listView: UITableView!
@IBOutlet weak var searchBg: UIView!
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "选择仓库"
self.view.addSubview(navbar)
SetTopFrame(view: searchBg, height: 0)
listView.separatorStyle = .none
listView.register(UINib(nibName: "WarehoseMangementCell", bundle: nil), forCellReuseIdentifier: "WarehoseMangementCell")
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let UserToken = UserDefaults.standard.value(forKey: "user_token")
let wModel = rkWareHouseArr[indexPath.row]
WarehouseDetail(["user_token":UserToken as Any,"w_id":wModel.w_id as Any], success: { (data) in
var arr:Array<ShopWarehouseDetailDataPositionModel> = []
let model = data as! ShopWarehouseDetailModel
model.data?.position_res?.forEach({ (item) in
arr.append(item)
})
self.delegate?.NewSelectWarehouseVCFinish(kuWeiArr: arr, data: wModel)
self.navigationController?.popViewController(animated: true)
}) { (error) in
}
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "WarehoseMangementCell") as! WarehoseMangementCell
cell.tag = indexPath.row
let data = rkWareHouseArr[cell.tag]
cell.statusLbl.isHidden = false
cell.nameLbl.text = data.w_name
cell.kuCunLbl.text = "库存位" + StringByInt(number: data.inventory_count!)
cell.adrLbl.text = data.w_address
switch data.w_type {
case 0:
//异常
cell.statusLbl.isHidden = true
break
case 1:
cell.statusLbl.backgroundColor = UIColor(named: "标题背景色")
cell.statusLbl.alpha = 1
break
case 2:
cell.statusLbl.backgroundColor = UIColor(named: "蓝色字体颜色")
cell.statusLbl.alpha = 0.5
break
case 3:
cell.statusLbl.backgroundColor = UIColor(named: "蓝色字体颜色")
cell.statusLbl.alpha = 1
break
default:
break
}
return cell
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return rkWareHouseArr.count
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return 94
}
}
GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewSelectWarehouseVC.xib 0 → 100644
View file @ 21ea9098
<?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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="NewSelectWarehouseVC" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="listView" destination="q3W-Jw-Xzp" id="Lin-fT-zUM"/>
<outlet property="searchBg" destination="68c-14-FJR" id="Vl6-y6-bYl"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="q3W-Jw-Xzp">
<rect key="frame" x="0.0" y="44" width="414" height="852"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<connections>
<outlet property="dataSource" destination="-1" id="cA8-I8-Hkw"/>
<outlet property="delegate" destination="-1" id="E5G-KO-Odo"/>
</connections>
</tableView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="68c-14-FJR">
<rect key="frame" x="0.0" y="44" width="414" height="0.0"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="height" id="frj-Gs-H2H"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="68c-14-FJR" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="G1P-qk-at1"/>
<constraint firstAttribute="bottom" secondItem="q3W-Jw-Xzp" secondAttribute="bottom" id="NZo-ab-3ml"/>
<constraint firstItem="q3W-Jw-Xzp" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="Q1a-Wr-51X"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="68c-14-FJR" secondAttribute="trailing" id="gtk-un-YEI"/>
<constraint firstItem="68c-14-FJR" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="h3E-6S-069"/>
<constraint firstItem="q3W-Jw-Xzp" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="qZy-pZ-9Jb"/>
<constraint firstItem="q3W-Jw-Xzp" firstAttribute="top" secondItem="68c-14-FJR" secondAttribute="bottom" id="sE9-zu-MnY"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<point key="canvasLocation" x="131.8840579710145" y="123.88392857142857"/>
</view>
</objects>
</document>
GeliBusinessPlatform/ViewController/仓库管理/WarehoseMangementCell.xib
View file @ 21ea9098
......@@ -2,6 +2,7 @@
<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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
......@@ -145,7 +146,7 @@
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="蓝色字体颜色">
<color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/商品管理/GoodsManageListVC.swift
View file @ 21ea9098
......@@ -494,8 +494,11 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
if rowModel.is_show == 1 {
if isTrue {
print("入库哦哦")
HUD.flash(.label("敬请期待"),delay: 1.2)
return
// HUD.flash(.label("敬请期待"),delay: 1.2)
// return
let vc = NewRKVc()
vc.goods_id = changeGoodsResModel?.goods_id
self.navigationController?.pushViewController(vc, animated: true)
// let vc = RuKuViewController()
// vc.barTitle = "入库"
// self.navigationController?.pushViewController(vc, animated: true)
......@@ -524,8 +527,11 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
}else{
print("入库哦哦")
HUD.flash(.label("敬请期待"),delay: 1.2)
return
let vc = NewRKVc()
vc.goods_id = changeGoodsResModel?.goods_id
self.navigationController?.pushViewController(vc, animated: true)
// HUD.flash(.label("敬请期待"),delay: 1.2)
// return
// let vc = RuKuViewController()
// vc.barTitle = "入库"
// self.navigationController?.pushViewController(vc, animated: true)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment