Skip to content

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

补充入库新增内容

parent ea297a11
Hide whitespace changes
Inline Side-by-side
Showing with 370 additions and 163 deletions
GeliBusinessPlatform/Model/LalamoveInterface/LalamoveModel.swift
View file @ ebb2bf19
......@@ -555,11 +555,13 @@ class getHllOrderDetailsSalePlatDataModel: Mappable {
var wb_no : String?
var bill_price_arr:Float?
var pay_status:Int?
var pay_time:String?
required init?( map: Map) {
}
func mapping(map: Map) {
pay_time <- map["pay_time"]
sale_plat <- map["sale_plat"]
order_sn <- map["order_sn"]
hll_pay_status_two <- map["hll_pay_status_two"]
......
GeliBusinessPlatform/Model/Logistics/LogisticsModel.swift
View file @ ebb2bf19
......@@ -364,11 +364,13 @@ class logisticsOrderDetailsDataModel: Mappable {
var fc_flag_cn :String? //运费结算方式-中文
var zcservice : Int? //装货服务
var xcservice :Int? //卸货服务
var pay_time:String?//支付时间
required init?( map: Map) {
}
func mapping(map: Map) {
pay_time <- map["pay_time"]
id <- map["id"]
user_id <- map["user_id"]
wb_no <- map["wb_no"]
......
GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift
View file @ ebb2bf19
......@@ -276,7 +276,7 @@ class OrderDetailSaleResModel: Mappable {
}
class OrderDetailGoodsSourceModel: Mappable {
var ven_id:Int?//供应商的ven_id
var batch_id : Int?//产品批次号
var batch_sn : String?//产品批次号
var add_time : String? //入库时间
var production_data : String? //生产日期
var valid_date : String? //有效日期
......@@ -292,7 +292,7 @@ class OrderDetailGoodsSourceModel: Mappable {
}
func mapping(map: Map) {
ven_id <- map["ven_id"]
batch_id <- map["batch_id"]
batch_sn <- map["batch_sn"]
add_time <- map["add_time"]
production_data <- map["production_data"]
valid_date <- map["valid_date"]
......
GeliBusinessPlatform/Model/WarehouseManageModel/GetGoodBatchModel.swift
View file @ ebb2bf19
......@@ -26,7 +26,7 @@ class GetGoodBatchModel: Mappable {
class GetGoodBatchDataModel: Mappable {
var batch_id:Int?//批次id
var batch_sn : Int? //批次号
var batch_sn : String? //批次号
var w_id : Int? //仓储id
var p_id:Int? //库位id
......
GeliBusinessPlatform/Model/WarehouseManageModel/InputInitInfoModel.swift
View file @ ebb2bf19
......@@ -131,11 +131,19 @@ class InputInitInfoGoodsInfoModel: Mappable { //商品信息
var no_push_num:Int?
var report_id :String?
var ven_list:Array<InputInitInfoGoodsVenInfoModel>?
required init?( map: Map) {
}
func mapping(map: Map) {
sku_id <- map["sku_id"]
ven_list <- map["ven_list"]
goods_id <- map["goods_id"]
goods_name <- map["goods_name"]
goods_thumb <- map["goods_thumb"]
......@@ -154,6 +162,18 @@ class InputInitInfoGoodsInfoModel: Mappable { //商品信息
report_id <- map["report_id"]
}
}
class InputInitInfoGoodsVenInfoModel: Mappable {
var ven_id:Int?
var ven_name : String?
required init?( map: Map) {
}
func mapping(map: Map) {
ven_id <- map["ven_id"]
ven_name <- map["ven_name"]
}
}
class GoodsReportAddModel: Mappable {
var code:Int?
......
GeliBusinessPlatform/Model/WarehouseManageModel/IoGoodsDetailModel.swift
View file @ ebb2bf19
......@@ -42,7 +42,7 @@ class IoGoodsDetailDataIoResModel: Mappable {
var apply_remark:String?
//审核备注
var audit_remark : String?
var auditor:String?
required init?( map: Map) {
......@@ -50,6 +50,7 @@ class IoGoodsDetailDataIoResModel: Mappable {
func mapping(map: Map) {
apply_remark <- map["apply_remark"]
audit_remark <- map["audit_remark"]
auditor <- map["auditor"]
}
}
......@@ -73,8 +74,10 @@ class IoGoodsDetailDataGoodsResModel: Mappable {
var w_name : String?//仓库
var p_name:String?//库位
var ven_id:Int?
var ven_name:String?//供货供应商名称
var batch_id:Int?//商品批次号
var batch_sn:String?
var bar_code:Int?//商品条码
required init?( map: Map) {
......@@ -98,9 +101,10 @@ class IoGoodsDetailDataGoodsResModel: Mappable {
file_url <- map["file_url"]
w_name <- map["w_name"]
p_name <- map["p_name"]
ven_id <- map["ven_id"]
ven_name <- map["ven_name"]
batch_id <- map["batch_id"]
batch_sn <- map["batch_sn"]
bar_code <- map["bar_code"]
}
}
GeliBusinessPlatform/Other/SDK/HLPrinter/HLBluetooth/HLBLEManager.m
View file @ ebb2bf19
......@@ -321,6 +321,9 @@ static HLBLEManager *instance = nil;
// 读取特性中的值
- (void)peripheral:(CBPeripheral *)peripheral didUpdateValueForCharacteristic:(CBCharacteristic *)characteristic error:(NSError *)error
{
if (error) {
if (_valueForCharacteristicBlock) {
_valueForCharacteristicBlock(characteristic,nil,error);
......
GeliBusinessPlatform/View/Cell/TitleAndTFAndBtnCell.swift
View file @ ebb2bf19
......@@ -9,6 +9,7 @@
import UIKit
@objc protocol TitleAndTFAndBtnCellDelegate {
@objc optional func TitleAndTFAndBtnCellBtnClick()
@objc optional func TitleAndTFAndBtnCelltextFieldContent(str:String)
}
class TitleAndTFAndBtnCell: UITableViewCell {
var delegate:TitleAndTFAndBtnCellDelegate?
......@@ -21,9 +22,13 @@ class TitleAndTFAndBtnCell: UITableViewCell {
override func awakeFromNib() {
super.awakeFromNib()
self.selectionStyle = .none
textTF.addTarget(self, action: #selector(textChange(textField:)), for: .editingChanged)
// Initialization code
}
@objc func textChange(textField:UITextField){
delegate?.TitleAndTFAndBtnCelltextFieldContent?(str: textField.text!)
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
......
GeliBusinessPlatform/View/Cell/TitleAndTFAndBtnCell.xib
View file @ ebb2bf19
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" 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="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
......@@ -43,7 +43,7 @@
<constraint firstAttribute="width" constant="14" id="Kai-ig-cv8"/>
</constraints>
</imageView>
<button opaque="NO" alpha="0.5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bwc-Q5-ss2">
<button opaque="NO" alpha="0.5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bwc-Q5-ss2">
<rect key="frame" x="343" y="0.0" width="32" height="49"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<connections>
......
GeliBusinessPlatform/View/Cell/TitleAndTFCell.swift
View file @ ebb2bf19
......@@ -24,7 +24,7 @@ class TitleAndTFCell: UITableViewCell {
@objc func textChange(textField:UITextField){
print("te == ",textField.text)
delegate?.textFieldContent?(content: textField.text!, cell: self)
}
......
GeliBusinessPlatform/ViewController/1.1入库&出库/NewSelectItemVc.swift
View file @ ebb2bf19
......@@ -8,12 +8,14 @@
import UIKit
protocol NewSelectItemVcDelegate {
func NewSelectItemVcSelect(datas:Array<InputInitInfoGoodsInfoModel>,pici:Array<Array<GetGoodBatchDataModel>>)
func NewSelectItemVcSelect(datas:Array<InputInitInfoGoodsInfoModel>,pici:Array<Array<GetGoodBatchDataModel>>,select:Array<Int>,str:Array<String>)
}
class NewSelectItemVc: BaseViewController,UITableViewDelegate,UITableViewDataSource{
var isRuKu = false
var rkDatas:Array<InputInitInfoGoodsInfoModel> = []
var rkSelectArr:Array<InputInitInfoGoodsInfoModel> = []
var select_ven_list:Array<Int> = []
var report_sn_arr:Array<String> = []
var tempRecord:Array<Int> = []
var recordArr:Array<Array<GetGoodBatchDataModel>> = []{
didSet{
......@@ -36,7 +38,7 @@ class NewSelectItemVc: BaseViewController,UITableViewDelegate,UITableViewDataSou
}
}
}
delegate?.NewSelectItemVcSelect(datas: rkSelectArr, pici: recordArr)
delegate?.NewSelectItemVcSelect(datas: rkSelectArr, pici: recordArr,select:select_ven_list,str:report_sn_arr)
self.navigationController?.popViewController(animated: true)
}
@IBOutlet weak var listView: UITableView!
......@@ -89,12 +91,22 @@ class NewSelectItemVc: BaseViewController,UITableViewDelegate,UITableViewDataSou
}
if idx != nil {
rkSelectArr.remove(at: idx!)
if select_ven_list.count > 0 {
select_ven_list.remove(at: idx!)
report_sn_arr.remove(at: idx!)
}
if !isRuKu {
tempRecord.insert(10086, at: idx!)
tempRecord.remove(at: idx!+1)
}
}else{
rkSelectArr.append(data)
report_sn_arr.append("")
if data.ven_list?.count == 1 {
select_ven_list.append(0)
}else{
select_ven_list.append(-1)
}
}
listView.reloadData()
}
......
GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewOnlyRKCell.swift
View file @ ebb2bf19
......@@ -13,14 +13,23 @@ protocol NewOnlyRKCellDelegate {
func NewOnlyRKCellAddRepord(cell:NewOnlyRKCell)//添加检测报告
func NewOnlyRKCellDel(cell:NewOnlyRKCell)//删除
func NewOnlyRKCellTFinput(text:String,inputType:Int,cell:NewOnlyRKCell)
func NewOnlyRKCell_gys_select(cell:NewOnlyRKCell)
}
class NewOnlyRKCell: UITableViewCell,UITextFieldDelegate {
@IBAction func select_gys_action(_ sender: UIButton) {
delegate?.NewOnlyRKCell_gys_select(cell: self)
}
@IBOutlet weak var btn_title_lbl: UILabel!
var delegate:NewOnlyRKCellDelegate?
@IBAction func add_report_action(_ sender: UIButton) {
delegate?.NewOnlyRKCellAddRepord(cell: self)
}
@IBOutlet weak var gys_right_margin: NSLayoutConstraint!
@IBOutlet weak var gys_arrow: UIImageView!
@IBOutlet weak var gys_name_lbl: UILabel!
@IBOutlet weak var titLbl: UILabel!
@IBOutlet weak var delBtn: UIButton!
@IBOutlet weak var rightBtn: UIButton!
......
GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewOnlyRKCell.xib
View file @ ebb2bf19
......@@ -12,10 +12,10 @@
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="326" id="KGk-i7-Jjw" customClass="NewOnlyRKCell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="411" height="375"/>
<rect key="frame" x="0.0" y="0.0" width="411" height="424"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="411" height="375"/>
<rect key="frame" x="0.0" y="0.0" width="411" height="424"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JdU-F8-6ck">
......@@ -65,19 +65,19 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="入库价格：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PST-FC-fG9">
<rect key="frame" x="15" y="100" width="67" height="16"/>
<rect key="frame" x="15" y="145" width="67" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="元" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7fF-Od-2O3">
<rect key="frame" x="382.5" y="100" width="13.5" height="16"/>
<rect key="frame" x="382.5" y="145" width="13.5" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="kGM-d5-IE6">
<rect key="frame" x="312.5" y="92" width="65" height="32"/>
<rect key="frame" x="312.5" y="137" width="65" height="32"/>
<constraints>
<constraint firstAttribute="height" constant="32" id="EoK-7u-slA"/>
<constraint firstAttribute="width" constant="65" id="baW-j7-X0z"/>
......@@ -98,20 +98,20 @@
</userDefinedRuntimeAttributes>
</textField>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gda-ra-tfi">
<rect key="frame" x="15" y="132" width="396" height="1"/>
<rect key="frame" x="15" y="177" width="396" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="11O-28-PNy"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="入库数量：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dXp-Fv-ghH">
<rect key="frame" x="15" y="148.5" width="67" height="16"/>
<rect key="frame" x="15" y="193.5" width="67" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="s2D-dg-gBi">
<rect key="frame" x="313" y="140.5" width="83" height="32"/>
<rect key="frame" x="313" y="185.5" width="83" height="32"/>
<constraints>
<constraint firstAttribute="height" constant="32" id="Bwg-y9-nd6"/>
<constraint firstAttribute="width" constant="83" id="lTi-jd-pXF"/>
......@@ -132,20 +132,20 @@
</userDefinedRuntimeAttributes>
</textField>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eh6-mf-agL">
<rect key="frame" x="15" y="181" width="396" height="1"/>
<rect key="frame" x="15" y="226" width="396" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="DSR-1b-lOx"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="入库总价：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D4z-vi-ogp">
<rect key="frame" x="15" y="197" width="67" height="16"/>
<rect key="frame" x="15" y="242" width="67" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入入库总价" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="DNW-1v-r8x">
<rect key="frame" x="97" y="189" width="299" height="32"/>
<rect key="frame" x="97" y="234" width="299" height="32"/>
<constraints>
<constraint firstAttribute="height" constant="32" id="xhx-Wp-Bnu"/>
</constraints>
......@@ -154,33 +154,33 @@
<textInputTraits key="textInputTraits" keyboardType="decimalPad"/>
</textField>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GM4-XT-zet">
<rect key="frame" x="15" y="228.5" width="396" height="1"/>
<rect key="frame" x="15" y="273.5" width="396" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="sv0-Vq-2JA"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="生产日期：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tfu-6M-ZkV">
<rect key="frame" x="15" y="244.5" width="67" height="16"/>
<rect key="frame" x="15" y="289.5" width="67" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="jinruDetail" translatesAutoresizingMaskIntoConstraints="NO" id="4j6-NB-EJe">
<rect key="frame" x="389" y="249" width="7" height="7"/>
<rect key="frame" x="389" y="294" width="7" height="7"/>
<constraints>
<constraint firstAttribute="height" constant="7" id="arg-rE-5Ph"/>
<constraint firstAttribute="width" constant="7" id="wwL-Eu-ppt"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请选择生产日期" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yHy-KY-Uxt">
<rect key="frame" x="286" y="244.5" width="93" height="16"/>
<rect key="frame" x="286" y="289.5" width="93" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="多选按钮字体颜色"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="u0a-wt-8oE">
<rect key="frame" x="97" y="237.5" width="314" height="30"/>
<rect key="frame" x="97" y="282.5" width="314" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="IyB-by-Zv6"/>
</constraints>
......@@ -189,20 +189,20 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Fwd-sD-T0h">
<rect key="frame" x="15" y="275.5" width="396" height="1"/>
<rect key="frame" x="15" y="320.5" width="396" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="hIf-f1-pJO"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="保质期：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fAB-2b-X7A">
<rect key="frame" x="15" y="291.5" width="54" height="16"/>
<rect key="frame" x="15" y="336.5" width="54" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tZB-Uo-CY9">
<rect key="frame" x="364" y="284.5" width="32" height="32"/>
<rect key="frame" x="364" y="329.5" width="32" height="32"/>
<color key="backgroundColor" name="app底色"/>
<constraints>
<constraint firstAttribute="height" constant="32" id="W2B-oA-DNZ"/>
......@@ -221,7 +221,7 @@
</connections>
</button>
<button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6MO-V8-sMn">
<rect key="frame" x="332" y="284.5" width="32" height="32"/>
<rect key="frame" x="332" y="329.5" width="32" height="32"/>
<color key="backgroundColor" name="app底色"/>
<constraints>
<constraint firstAttribute="width" constant="32" id="Rhx-1I-j8d"/>
......@@ -240,7 +240,7 @@
</connections>
</button>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="fLT-jy-0yj">
<rect key="frame" x="249" y="284.5" width="83" height="32"/>
<rect key="frame" x="249" y="329.5" width="83" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="83" id="Dnk-eA-tTw"/>
<constraint firstAttribute="height" constant="32" id="zZC-ZH-Pwa"/>
......@@ -261,27 +261,27 @@
</userDefinedRuntimeAttributes>
</textField>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="82n-oH-pbs">
<rect key="frame" x="0.0" y="374" width="411" height="1"/>
<rect key="frame" x="0.0" y="423" width="411" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="Zg1-gz-BTV"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ThE-Le-aUU">
<rect key="frame" x="15" y="325.5" width="396" height="1"/>
<rect key="frame" x="15" y="370.5" width="396" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="cIP-cg-G0y"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="检测报告：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PdO-Zj-Dft">
<rect key="frame" x="15" y="341.5" width="65" height="15.5"/>
<rect key="frame" x="15" y="386.5" width="65" height="15.5"/>
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="13"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zbb-dP-OOv">
<rect key="frame" x="356" y="325" width="55" height="49"/>
<rect key="frame" x="356" y="374" width="55" height="49"/>
<constraints>
<constraint firstAttribute="width" constant="55" id="0sS-wq-6l2"/>
<constraint firstAttribute="height" constant="49" id="3kt-ou-1OQ"/>
......@@ -295,11 +295,46 @@
</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="siW-9R-nkU">
<rect key="frame" x="370" y="340.5" width="26" height="18.5"/>
<rect key="frame" x="370" y="389.5" width="26" height="18.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="蓝色字体颜色"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yiW-ss-vjd">
<rect key="frame" x="15" y="127" width="396" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="36j-Eg-CbE"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选择供应商" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cjW-CW-DMa">
<rect key="frame" x="15" y="96" width="65" height="19"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="jinruDetail" translatesAutoresizingMaskIntoConstraints="NO" id="H9N-Xe-DWI">
<rect key="frame" x="389" y="102" width="7" height="7"/>
<constraints>
<constraint firstAttribute="height" constant="7" id="doL-k1-TMK"/>
<constraint firstAttribute="width" constant="7" id="x7u-KD-gCL"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请选择供应商" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zPp-hg-GQ4">
<rect key="frame" x="301" y="96.5" width="78" height="18.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="多选按钮字体颜色"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gFX-7x-lxU">
<rect key="frame" x="80" y="90.5" width="331" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="tlM-vP-Blp"/>
</constraints>
<connections>
<action selector="select_gys_action:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="7Xt-yb-Rae"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="Fr1-SS-krs" firstAttribute="top" secondItem="chy-ny-kVr" secondAttribute="bottom" constant="10" id="1nB-uL-p9g"/>
......@@ -318,11 +353,15 @@
<constraint firstItem="eh6-mf-agL" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="G0G-wn-HSD"/>
<constraint firstItem="yHy-KY-Uxt" firstAttribute="centerY" secondItem="tfu-6M-ZkV" secondAttribute="centerY" id="I0s-zF-fej"/>
<constraint firstItem="chy-ny-kVr" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="I2L-HW-UOe"/>
<constraint firstItem="gFX-7x-lxU" firstAttribute="leading" secondItem="cjW-CW-DMa" secondAttribute="trailing" id="IMo-sI-Mmc"/>
<constraint firstItem="gFX-7x-lxU" firstAttribute="centerY" secondItem="cjW-CW-DMa" secondAttribute="centerY" id="In1-ma-N5z"/>
<constraint firstItem="Fr1-SS-krs" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="Ixt-AE-ntn"/>
<constraint firstItem="tfu-6M-ZkV" firstAttribute="top" secondItem="GM4-XT-zet" secondAttribute="bottom" constant="15" id="JZ2-S6-mTB"/>
<constraint firstAttribute="trailing" secondItem="gFX-7x-lxU" secondAttribute="trailing" id="LbI-pP-iS7"/>
<constraint firstItem="6MO-V8-sMn" firstAttribute="centerY" secondItem="tZB-Uo-CY9" secondAttribute="centerY" id="Lm1-T9-kbq"/>
<constraint firstItem="eh6-mf-agL" firstAttribute="top" secondItem="s2D-dg-gBi" secondAttribute="bottom" constant="8.5" id="MZs-lR-nNo"/>
<constraint firstItem="cxO-LI-2Sg" firstAttribute="leading" secondItem="chy-ny-kVr" secondAttribute="trailing" constant="10" id="MdC-oG-xD6"/>
<constraint firstAttribute="trailing" secondItem="H9N-Xe-DWI" secondAttribute="trailing" constant="15" id="O2T-x7-txi"/>
<constraint firstAttribute="trailing" secondItem="DNW-1v-r8x" secondAttribute="trailing" constant="15" id="OHO-cw-1Ti"/>
<constraint firstAttribute="trailing" secondItem="tZB-Uo-CY9" secondAttribute="trailing" constant="15" id="P7F-oi-qh9"/>
<constraint firstAttribute="trailing" secondItem="82n-oH-pbs" secondAttribute="trailing" id="PKk-AU-ljC"/>
......@@ -346,16 +385,23 @@
<constraint firstItem="siW-9R-nkU" firstAttribute="centerY" secondItem="Zbb-dP-OOv" secondAttribute="centerY" id="eAW-Fj-8jr"/>
<constraint firstAttribute="trailing" secondItem="7fF-Od-2O3" secondAttribute="trailing" constant="15" id="eRm-W7-r3f"/>
<constraint firstAttribute="trailing" secondItem="s2D-dg-gBi" secondAttribute="trailing" constant="15" id="eWH-sR-ZVd"/>
<constraint firstItem="cjW-CW-DMa" firstAttribute="leading" secondItem="Fr1-SS-krs" secondAttribute="leading" id="exx-pm-XdL"/>
<constraint firstItem="chy-ny-kVr" firstAttribute="top" secondItem="JdU-F8-6ck" secondAttribute="bottom" constant="15" id="ezY-Db-N2T"/>
<constraint firstItem="H9N-Xe-DWI" firstAttribute="centerY" secondItem="cjW-CW-DMa" secondAttribute="centerY" id="ezu-hs-oTR"/>
<constraint firstItem="zPp-hg-GQ4" firstAttribute="centerY" secondItem="cjW-CW-DMa" secondAttribute="centerY" id="fGL-lF-rCZ"/>
<constraint firstItem="cxO-LI-2Sg" firstAttribute="top" secondItem="JdU-F8-6ck" secondAttribute="bottom" id="fOn-pK-ouG"/>
<constraint firstAttribute="trailing" secondItem="eh6-mf-agL" secondAttribute="trailing" id="fsj-lq-pzi"/>
<constraint firstItem="yiW-ss-vjd" firstAttribute="top" secondItem="Fr1-SS-krs" secondAttribute="bottom" constant="49" id="h31-hY-Hn5"/>
<constraint firstAttribute="trailing" secondItem="yiW-ss-vjd" secondAttribute="trailing" id="hOy-qO-kPj"/>
<constraint firstItem="yiW-ss-vjd" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="jIV-xK-8Hh"/>
<constraint firstItem="D4z-vi-ogp" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="koc-uk-Wmg"/>
<constraint firstItem="6MO-V8-sMn" firstAttribute="leading" secondItem="fLT-jy-0yj" secondAttribute="trailing" id="l3w-Wi-Wv9"/>
<constraint firstAttribute="trailing" secondItem="Zbb-dP-OOv" secondAttribute="trailing" id="mTz-Vg-lTL"/>
<constraint firstItem="ThE-Le-aUU" firstAttribute="top" secondItem="Fwd-sD-T0h" secondAttribute="bottom" constant="49" id="mbX-cc-Lxw"/>
<constraint firstItem="DNW-1v-r8x" firstAttribute="leading" secondItem="D4z-vi-ogp" secondAttribute="trailing" constant="15" id="nsc-Yp-dmq"/>
<constraint firstItem="PdO-Zj-Dft" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="p1x-ze-2Lr"/>
<constraint firstItem="PST-FC-fG9" firstAttribute="top" secondItem="Fr1-SS-krs" secondAttribute="bottom" constant="22" id="qVK-iA-Oem"/>
<constraint firstItem="PST-FC-fG9" firstAttribute="top" secondItem="yiW-ss-vjd" secondAttribute="bottom" constant="17" id="qVK-iA-Oem"/>
<constraint firstItem="H9N-Xe-DWI" firstAttribute="leading" secondItem="zPp-hg-GQ4" secondAttribute="trailing" constant="10" id="qzc-sR-a5B"/>
<constraint firstAttribute="trailing" secondItem="Fr1-SS-krs" secondAttribute="trailing" constant="15" id="sbK-G2-P0h"/>
<constraint firstItem="kGM-d5-IE6" firstAttribute="centerY" secondItem="PST-FC-fG9" secondAttribute="centerY" id="t0z-cG-nJ3"/>
<constraint firstAttribute="trailing" secondItem="ThE-Le-aUU" secondAttribute="trailing" id="twC-NR-EUN"/>
......@@ -365,6 +411,7 @@
<constraint firstItem="4j6-NB-EJe" firstAttribute="leading" secondItem="yHy-KY-Uxt" secondAttribute="trailing" constant="10" id="wja-2I-IyW"/>
<constraint firstItem="ThE-Le-aUU" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="xR2-34-4SX"/>
<constraint firstItem="GM4-XT-zet" firstAttribute="top" secondItem="D4z-vi-ogp" secondAttribute="bottom" constant="15.5" id="xee-zN-VOT"/>
<constraint firstItem="cjW-CW-DMa" firstAttribute="top" secondItem="Fr1-SS-krs" secondAttribute="bottom" constant="18" id="yl9-cQ-VzH"/>
<constraint firstItem="Zbb-dP-OOv" firstAttribute="trailing" secondItem="siW-9R-nkU" secondAttribute="trailing" constant="15" id="yn4-iW-e5c"/>
<constraint firstItem="7fF-Od-2O3" firstAttribute="centerY" secondItem="PST-FC-fG9" secondAttribute="centerY" id="yyZ-7a-pit"/>
<constraint firstItem="PdO-Zj-Dft" firstAttribute="top" secondItem="ThE-Le-aUU" secondAttribute="bottom" constant="15" id="zOW-Lo-3jK"/>
......@@ -377,6 +424,9 @@
<outlet property="bzqTf" destination="fLT-jy-0yj" id="gg1-pH-dPz"/>
<outlet property="delBtn" destination="cxO-LI-2Sg" id="CYL-OW-Rud"/>
<outlet property="detailLbl" destination="Fr1-SS-krs" id="sBl-qJ-DRF"/>
<outlet property="gys_arrow" destination="H9N-Xe-DWI" id="15J-bn-f1b"/>
<outlet property="gys_name_lbl" destination="zPp-hg-GQ4" id="rM4-Hl-HFm"/>
<outlet property="gys_right_margin" destination="qzc-sR-a5B" id="7RU-h0-a9f"/>
<outlet property="leftBtn" destination="6MO-V8-sMn" id="nSx-Sf-HFW"/>
<outlet property="nameLbl" destination="chy-ny-kVr" id="nGD-0R-eZB"/>
<outlet property="rightBtn" destination="tZB-Uo-CY9" id="a9w-hG-3da"/>
......@@ -386,7 +436,7 @@
<outlet property="titLbl" destination="dXp-Fv-ghH" id="yQ6-ua-y2u"/>
<outlet property="totalPriceTf" destination="DNW-1v-r8x" id="emO-uV-Hk1"/>
</connections>
<point key="canvasLocation" x="155.79710144927537" y="116.85267857142857"/>
<point key="canvasLocation" x="155.79710144927537" y="116.51785714285714"/>
</tableViewCell>
</objects>
<resources>
......
GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewRKVc.swift
View file @ ebb2bf19
......@@ -14,6 +14,35 @@ protocol NewRKVcDelegate {
func NewRKVcFinish()
}
class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, NewOnlyRKCellDelegate,NewSelectItemVcDelegate,NewSelectWarehouseVCDelegate,GLAlertSelectViewDelegate,GeliAlertTextViewDelegate, ShowTimeSelectViewDelegate, GYSListViewControllerDelegate, GYSGLViewControllerDelegate, Add_Report_View_Delegate{
var isCaiGou_GYS_name:String = ""
var isCaiGou_GYS_ven_id:Int = -1
var select_ven_list:Array<Int> = []
func NewOnlyRKCell_gys_select(cell: NewOnlyRKCell) {
if rkSelectArr[cell.tag].ven_list!.count == 0 {
return
}
if isCaiGou || rkSelectArr[cell.tag].ven_list!.count == 1{
return
}
if glSelectView == nil {
var gys_arr:Array<String> = []
rkSelectArr[cell.tag].ven_list?.forEach({ (item) in
gys_arr.append(item.ven_name!)
})
let view = GLAlertSelectView(frame: self.view.bounds)
view.tag = cell.tag
view.selectNum = typeSelect
view.tempNum = view.selectNum
view.isOnlySelectKuWei = true
view.delegate = self
view.titleLbl.text = "请选择供应商"
view.dataArr = gys_arr
self.view.addSubview(view)
glSelectView = view
}
}
func Add_Report_View_ChangeImg(view: Add_Report_View, idx: Int) {
_ = self.presentHGImagePicker(maxSelected:1) { (assets) in
//结果处理
......@@ -39,7 +68,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
report_view?.layoutIfNeeded()
}
var report_sn = ""
var report_sn_arr:Array<String> = []
func Add_Report_View_Submit_Action(view: Add_Report_View) {
var lastGoodsBanner:Array<String> = []
self.goods_banner?.forEach({ (str) in
......@@ -49,14 +78,16 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
})
var goods_bannerStr:String = ""
if lastGoodsBanner.count > 0 {
// goods_bannerStr = dataChangeString(sender: lastGoodsBanner)
// goods_bannerStr = dataChangeString(sender: lastGoodsBanner)
goods_bannerStr = lastGoodsBanner.joined(separator: ",")
}
report_sn = view.report_sn_tf.text!
// report_sn = view.report_sn_tf.text!
report_sn_arr.insert(view.report_sn_tf.text!, at: view.tag)
report_sn_arr.remove(at: view.tag + 1)
let model = rkSelectArr[view.tag]
let dic = ["user_token":UserToken as Any,
"report_sn":view.report_sn_tf!.text! as Any,
"report_sn":report_sn_arr[view.tag] as Any,
"report_type":view.select_idx! + 1 as Any,
"goods_id":model.goods_id as Any,
"sku_id":model.sku_id as Any,
......@@ -66,21 +97,29 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
let model = data as! GoodsReportAddModel
let rkModel = self.rkSelectArr[view.tag]
rkModel.report_id = model.data?.report_id
self.maxFiveImgsArr.removeAll()
self.report_view?.removeFromSuperview()
self.report_view = nil
self.listView.reloadData()
} failture: { (err) in
}
}
func NewSelectItemVcSelect(datas: Array<InputInitInfoGoodsInfoModel>, pici: Array<Array<GetGoodBatchDataModel>>) {
func NewSelectItemVcSelect(datas: Array<InputInitInfoGoodsInfoModel>, pici: Array<Array<GetGoodBatchDataModel>>,select:Array<Int>,str:Array<String>) {
rkSelectArr.removeAll()
datas.forEach { (model) in
rkSelectArr.append(model)
}
report_sn_arr.removeAll()
str.forEach { (item) in
report_sn_arr.append(item)
}
select_ven_list.removeAll()
select.forEach { (item) in
select_ven_list.append(item)
}
listView.reloadData()
}
......@@ -97,7 +136,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
option.isNetworkAccessAllowed = true
for asset in assets {
PHImageManager.default().requestImage(for: asset, targetSize: PHImageManagerMaximumSize , contentMode: .default , options: option, resultHandler: { (image, _: [AnyHashable : Any]?) in
//调用上传图片
self.maxFiveImgsArr.append("insert")
self.uploadImg(imge: image!, isOriginal: false, tag: self.maxFiveImgsArr.count-1)
......@@ -175,14 +214,14 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
HUD.flash(.label("请选择入库类型"), delay: 1.2)
return
}
// if holderArr[3] == "请选择供应商" {
// HUD.flash(.label("请选择供应商"), delay: 1.2)
// return
// }
// if holderArr[4] == "请选择商品类型" {
// HUD.flash(.label("请选择商品类型"), delay: 1.2)
// return
// }
// if holderArr[3] == "请选择供应商" {
// HUD.flash(.label("请选择供应商"), delay: 1.2)
// return
// }
// if holderArr[4] == "请选择商品类型" {
// HUD.flash(.label("请选择商品类型"), delay: 1.2)
// return
// }
if rkSelectArr.count == 0 {
HUD.flash(.label("请选择商品"), delay: 1.2)
return
......@@ -209,7 +248,8 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
HUD.show(.progress)
if lgBtnTitLbl.text != "提交申请"{
var goodsInfoArr:Array<Any>? = []
rkSelectArr.forEach { (model) in
for i in 0 ..< rkSelectArr.count {
let model = rkSelectArr[i]
var rkjg:Float = 0
var total:Float = 0
if model.RKJG != nil {
......@@ -223,6 +263,11 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
if model.DayType == 0 {
shelf_life = model.BZQ! * 30
}
var ven_id = 0
if select_ven_list[i] != -1 {
let mo = model.ven_list![select_ven_list[i]]
ven_id = mo.ven_id!
}
let goods = [
"goods_id":model.goods_id as Any,
"sku_id":model.sku_id as Any,
......@@ -235,15 +280,13 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
"production_data":model.createDay as Any,
"shelf_life":shelf_life as Any,
"report_id":model.report_id as Any,
"pog_id":model.pog_id as Any
"pog_id":model.pog_id as Any,
"ven_id":ven_id as Any
]
goodsInfoArr?.append(goods)
}
let goods_info = dataChangeString(sender: goodsInfoArr!)
//直接入库
// if rkTypeArr[typeSelect] == "直营入库" {
// typeSelect = 9
// }
let dict = [
"user_token":UserToken as Any,
"w_id":w_id as Any,
......@@ -268,7 +311,8 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
var goodsInfoArr:Array<Any>? = []
rkSelectArr.forEach { (model) in
for i in 0 ..< rkSelectArr.count {
let model = rkSelectArr[i]
var total:Float = 0
total = model.RKJG! * Float(model.RKSL!)
......@@ -277,7 +321,11 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
shelf_life = model.BZQ! * 30
}
var ven_id = 0
if select_ven_list[i] != -1 {
let mo = model.ven_list![select_ven_list[i]]
ven_id = mo.ven_id!
}
let goods = [
"goods_id":model.goods_id as Any,
"sku_id":model.sku_id as Any,
......@@ -290,14 +338,12 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
"production_data":model.createDay as Any,
"shelf_life":shelf_life as Any,
"report_id":0 as Any,
"pog_id":model.pog_id as Any
"pog_id":model.pog_id as Any,
"ven_id":ven_id as Any
]
goodsInfoArr?.append(goods)
}
let goods_info = dataChangeString(sender: goodsInfoArr!)
// if rkTypeArr[typeSelect] == "直营入库" {
// typeSelect = 9
// }
let dict = [
"user_token":UserToken as Any,
"i_type":typeSelect + 8 as Any,
......@@ -329,12 +375,12 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
@IBOutlet weak var lgBtnTitLbl: UILabel!
@IBOutlet weak var lgBtn: LGButton!
var isGm = false
var titleArr = ["仓库：","库位：","入库类型：","备注："]
var holderArr = ["请选择仓库","请选择库位","固定采购","请输入备注"]
// var titleArr = ["仓库：","库位：","入库类型：","选择供应商：","选择商品类型：","备注："]
// var holderArr = ["请选择仓库","请选择库位","直营入库","请选择供应商","直销商品","请输入备注"]
var titleArr = ["仓库：","库位：","入库类型：","备注："]
var holderArr = ["请选择仓库","请选择库位","固定采购","请输入备注"]
// var titleArr = ["仓库：","库位：","入库类型：","选择供应商：","选择商品类型：","备注："]
// var holderArr = ["请选择仓库","请选择库位","直营入库","请选择供应商","直销商品","请输入备注"]
//入库类型 // "固定采购","临时采购"
// var rkTypeArr = ["采购","调入","退货","生产","调出被拒绝","外采","其他","直营入库"]
// var rkTypeArr = ["采购","调入","退货","生产","调出被拒绝","外采","其他","直营入库"]
var rkTypeArr = ["固定采购","临时采购","直营入库"]
var rkSelectTypeArr = ["直销商品","代销商品"]
var typeSelect:Int = 0
......@@ -393,7 +439,6 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
listView.register(UINib(nibName: "TitleAndLblCell", bundle: nil), forCellReuseIdentifier: "TitleAndLblCell")
loadData()
// Do any additional setup after loading the view.
}
......@@ -465,10 +510,21 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
model.data?.goods_info?.forEach({ (item) in
if item.sku_id == self.sku_id {
self.rkSelectArr.append(item)
}
self.rkDatas.append(item)
})
self.report_sn_arr.removeAll()
self.select_ven_list.removeAll()
self.rkSelectArr.forEach { (item) in
self.report_sn_arr.append("")
if item.ven_list?.count == 1 {
self.select_ven_list.append(0)
}else{
self.select_ven_list.append(-1)
}
}
self.listView.reloadData()
HUD.hide()
......@@ -484,28 +540,28 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
if indexPath.section == 1 {
return
}
// if indexPath.row == 3 {
// print("选择供应商")
// let vc = GYSListViewController()
// vc.barTitle = "选择供应商"
// vc.delegate = self
// self.navigationController?.pushViewController(vc, animated: true)
// }
// if indexPath.row == 4 {
// if isCaiGou == false{
// if glSelectView == nil {
// let view = GLAlertSelectView(frame: self.view.bounds)
// view.tag = indexPath.row
// view.selectNum = selectTypeSelect
// view.isOnlySelectKuWei = true
// view.delegate = self
// view.titleLbl.text = "选择商品类型"
// view.dataArr = rkSelectTypeArr
// self.view.addSubview(view)
// glSelectView = view
// }
// }
// }
// if indexPath.row == 3 {
// print("选择供应商")
// let vc = GYSListViewController()
// vc.barTitle = "选择供应商"
// vc.delegate = self
// self.navigationController?.pushViewController(vc, animated: true)
// }
// if indexPath.row == 4 {
// if isCaiGou == false{
// if glSelectView == nil {
// let view = GLAlertSelectView(frame: self.view.bounds)
// view.tag = indexPath.row
// view.selectNum = selectTypeSelect
// view.isOnlySelectKuWei = true
// view.delegate = self
// view.titleLbl.text = "选择商品类型"
// view.dataArr = rkSelectTypeArr
// self.view.addSubview(view)
// glSelectView = view
// }
// }
// }
if indexPath.row == 3 {
let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
alterView.delegate = self
......@@ -648,9 +704,37 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
if data.createDayStr != nil {
cell.timeLbl.text = data.createDayStr
}
if report_sn.count > 0 {
let report_sn = report_sn_arr[indexPath.row]
if report_sn.count != 0 {
cell.btn_title_lbl.text = "sn:" + report_sn
}
cell.gys_name_lbl.text = "请选择供应商"
cell.gys_arrow.isHidden = false
cell.gys_right_margin.constant = 10
if isCaiGou_GYS_ven_id != -1 {
cell.gys_name_lbl.text = isCaiGou_GYS_name
cell.gys_arrow.isHidden = true
cell.gys_right_margin.constant = -7
}
if data.ven_list?.count == 1 {
let mo = data.ven_list?.first
cell.gys_name_lbl.text = mo?.ven_name
cell.gys_arrow.isHidden = true
cell.gys_right_margin.constant = -7
}else{
if select_ven_list.count > 0 {
if select_ven_list[indexPath.row] != -1 {
let mo = data.ven_list![select_ven_list[indexPath.row]]
cell.gys_name_lbl.text = mo.ven_name
cell.gys_arrow.isHidden = true
cell.gys_right_margin.constant = -7
}
}
}
return cell
}
......@@ -742,6 +826,8 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
func NewOnlyRKCellDel(cell: NewOnlyRKCell) {
//删除
rkSelectArr.remove(at: cell.tag)
select_ven_list.remove(at: cell.tag)
report_sn_arr.remove(at: cell.tag)
listView.reloadData()
}
......@@ -790,6 +876,8 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
vc.isRuKu = true
vc.rkDatas = rkDatas
vc.rkSelectArr = rkSelectArr
vc.select_ven_list = select_ven_list
vc.report_sn_arr = report_sn_arr
self.navigationController?.pushViewController(vc, animated: true)
}
// func getStrHeight(str:String) -> CGFloat{
......@@ -816,7 +904,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
return 49
}
return 375
return 424
}
func setCellUI(cell:CRKBtnCell){
cell.contentLbl.textColor = UIColor(named: "标题字颜色")
......@@ -934,25 +1022,21 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
}
func GLAlertSelectViewClick(selectNum: Int, view: GLAlertSelectView) {
if view.titleLbl.text == "请选择供应商"{
select_ven_list.insert(selectNum, at: view.tag)
select_ven_list.remove(at: view.tag + 1)
glSelectView?.removeFromSuperview()
glSelectView = nil
listView.reloadData()
return
}
if view.tag == 2 {
typeSelect = selectNum
holderArr.insert(rkTypeArr[typeSelect], at: 2)
holderArr.remove(at: 3)
}else if view.tag == 4 {
// selectTypeSelect = selectNum
// holderArr.insert(rkSelectTypeArr[selectTypeSelect], at: 4)
// holderArr.remove(at: 5)
// if selectTypeSelect == 0 {
// typeSelect = 7
// holderArr.insert("直营入库", at: 2)
// holderArr.remove(at: 3)
// rkTypeArr = ["采购","调入","退货","生产","调出被拒绝","外采","其他","直营入库"]
// }else{
// holderArr.insert("固定采购", at: 2)
// holderArr.remove(at: 3)
// rkTypeArr = ["采购","调入","退货","生产","调出被拒绝","外采","其他","固定采购","临时采购"]
// typeSelect = 7
// }
}else{
selectIdx = selectNum
let data = poiArr[selectIdx!]
......
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/CKGmCell.swift
View file @ ebb2bf19
......@@ -98,7 +98,7 @@ class CKGmCell: UITableViewCell {
make.centerY.equalTo(view.snp_centerY)
make.width.equalTo(100)
}
leftL.text = "\(model.batch_id!)"
leftL.text = model.batch_sn
let middleL = UILabel()
bottomView.addSubview(middleL)
......
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/NewCKVc.swift
View file @ ebb2bf19
......@@ -10,7 +10,7 @@ import UIKit
import LGButton
class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNonGmCellDelegate,CKGmCellDelegate, PiCiXuanZeViewControllerDelegate,GLAlertSelectViewDelegate,NewSelectItemVcDelegate,GeliAlertTextViewDelegate, Print_Gprinter_View_Delegate{
func NewSelectItemVcSelect(datas: Array<InputInitInfoGoodsInfoModel>, pici: Array<Array<GetGoodBatchDataModel>>) {
func NewSelectItemVcSelect(datas: Array<InputInitInfoGoodsInfoModel>, pici: Array<Array<GetGoodBatchDataModel>>,select:Array<Int>,str:Array<String>) {
rkSelectArr.removeAll()
datas.forEach { (item) in
rkSelectArr.append(item)
......@@ -25,7 +25,7 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
func Print_Gprinter_View_Print(data: Array<Dictionary<String, Any>>) {
print("打印")
......@@ -546,6 +546,7 @@ class NewCKVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,CKNo
vc.rkDatas = rkDatas
vc.rkSelectArr = rkSelectArr
vc.recordArr = piCiArr!
self.navigationController?.pushViewController(vc, animated: true)
}
......
GeliBusinessPlatform/ViewController/代客下单（货运）/运单详情/YunDanXiangQingViewController.swift
View file @ ebb2bf19
......@@ -187,7 +187,7 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 36))
view.backgroundColor = UIColor.white
let lbl = UILabel()
lbl.text = "货物信息"
lbl.text = "快递信息"
lbl.textColor = UIColor(named: "标题字颜色")
lbl.font = UIFont.boldSystemFont(ofSize: 15)
view.addSubview(lbl)
......@@ -275,7 +275,7 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
return 30
}
let p2Arr = ["关联平台：","关联订单号：","运单号：","运费：","运费支付方式："]
let p3Arr = ["寄托物","寄托物包装","温类","总重量","件数","体积","寄件方式","派件方式","付款方式"]
let p3Arr = ["寄托物","寄托物包装","温类","总重量","件数","体积","寄件方式","派件方式","付款方式","支付时间"]
let p4Arr = ["额外服务","声明价值","保费","备注"]
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if indexPath.section == 0 {
......@@ -333,6 +333,7 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
arrStr.append((dataModel?.home_delivery_on_cn)!)
arrStr.append((dataModel?.site_delivery_cn)!)
arrStr.append((dataModel?.fc_flag_cn)!)
arrStr.append((dataModel?.pay_time)!)
var str = arrStr[indexPath.row]
if str == "" {
str = "-"
......
GeliBusinessPlatform/ViewController/供应商管理/GYSGLViewController.swift
View file @ ebb2bf19
......@@ -14,15 +14,16 @@ protocol GYSGLViewControllerDelegate {
func GYSGLViewControllerFinish()
}
class GYSGLViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndTFAndBtnCellDelegate,TitleAndOnlyBtnCellDelegate,SJMapViewControllerDelegate, UIPickerViewDelegate, UIPickerViewDataSource,GeliAlertViewDelegate,UITextFieldDelegate, TitleAndTFCellDelegate{
func TitleAndTFAndBtnCelltextFieldContent(str: String) {
detailDzStr = str
// listView.reloadData()
}
func textFieldContent(content: String, cell: TitleAndTFCell) {
switch cell.textTF.tag {
case 0:
gysName = content
break
case 2:
detailDzStr = content
break
case 99:
create_number = content
break
......@@ -246,6 +247,7 @@ class GYSGLViewController: BaseViewController,UITableViewDelegate,UITableViewDat
let sec2Arr = ["姓名：","手机：","电话："]
let hold2Arr = ["请输入联系人姓名","请输入联系人手机号码","请输入联系电话"]
let sec3Arr = ["单位统一社会信用代码：","营业资格证：","食品流通许可证："]
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
switch indexPath.section {
case 0:
......@@ -762,6 +764,7 @@ class GYSGLViewController: BaseViewController,UITableViewDelegate,UITableViewDat
HUD.flash(.label("请选择地址"), delay: 1.2)
return
}
print("abc == ",detailDzStr)
if detailDzStr.count == 0 {
HUD.flash(.label("请填写详细地址"), delay: 1.2)
return
......
GeliBusinessPlatform/ViewController/出入库记录/CRKXiangQVC.swift
View file @ ebb2bf19
......@@ -18,12 +18,8 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
let UserToken = UserDefaults.standard.value(forKey: "user_token")
func sureGeliAlertViewAction(sender: UIButton) {
//MARK: - 出入库列表 iog_id
var goodInfoArr:Array<Any> = []
inGoodsModels?.forEach({ (item) in
let goods = [
......@@ -110,7 +106,7 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
btmColor.isHidden = true
btmViewH.constant = 0
}
print("st = ",model?.status,model?.io_type)
if model?.status == 2 {//通过审核
IoGoodsDetail(dict, success: { (data) in
let model = data as! IoGoodsDetailModel
......@@ -519,8 +515,8 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
}
cell.pi_ci_lbl.text = "商品批次:无"
if data.batch_id != nil {
cell.pi_ci_lbl.text = "商品批次:" + "\(data.batch_id!)"
if data.batch_sn != nil {
cell.pi_ci_lbl.text = "商品批次:" + data.batch_sn!
}
cell.gys_lbl.text = "供应商:无"
......
GeliBusinessPlatform/ViewController/新增采购单/CGDCell1.xib
View file @ ebb2bf19
<?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="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
......@@ -25,7 +25,7 @@
<constraint firstAttribute="height" constant="1" id="tYk-77-cq1"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zUM-gk-TDF">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zUM-gk-TDF">
<rect key="frame" x="326.5" y="0.0" width="48.5" height="48.5"/>
<constraints>
<constraint firstAttribute="height" constant="48.5" id="5oN-gR-Ld8"/>
......@@ -157,8 +157,8 @@
<constraint firstAttribute="bottom" secondItem="c2P-6b-lpC" secondAttribute="bottom" id="xqy-z2-fqO"/>
</constraints>
</tableViewCellContentView>
<color key="backgroundColor" name="白色背景色"/>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<color key="backgroundColor" name="白色背景色"/>
<connections>
<outlet property="btnWidth" destination="IJP-pf-u5R" id="64D-9I-XmJ"/>
<outlet property="cgCount" destination="HF8-ja-1Mp" id="GRT-MI-GPA"/>
......@@ -180,7 +180,7 @@
<color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="个人中心灰色字体">
<color red="0.3919999897480011" green="0.3919999897480011" blue="0.3919999897480011" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.38823529411764707" green="0.38823529411764707" blue="0.38823529411764707" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......
GeliBusinessPlatform/ViewController/溯源/cell/S_Y_View_Cell.swift
View file @ ebb2bf19
......@@ -32,7 +32,7 @@ class S_Y_View_Cell: UITableViewCell {
sheng_chan_ri_qi_lbl.text = data?.production_data
chan_di_lbl.text = data?.product_origin
ru_ku_time_lbl.text = data?.add_time
pi_ci_number_lbl.text = StringByInt(number:(data?.batch_id)!)
pi_ci_number_lbl.text = data?.batch_sn
gys_name_lbl.text = data?.ven_name
img.sd_setImage(with: URL(string:SERVERCE_ImageHost + ((data?.report_picture?.first)!)!))
......
GeliBusinessPlatform/ViewController/蓝牙连接/BtViewController.m
View file @ ebb2bf19
......@@ -28,20 +28,7 @@
[self.navigationController popViewControllerAnimated:YES];
}
/** 接收到数据回调 */
- (void)peripheral:(CBPeripheral *)peripheral didUpdateValueForCharacteristic:(CBCharacteristic *)characteristic error:(NSError *)error {
NSData *data = characteristic.value; //获取到的数据
NSLog(@"bbb-----%@----",data); //打印出来应该是<01a5>这样的数据，可以通过下面的方式去判断一些自己想要的逻辑
Byte * resultByte = (Byte *)[data bytes];
if(data.length>=1){
if(resultByte[0]==16){ //16代表前两位的值
NSLog(@"---打印机打开---");
}else if (resultByte[0]==1){ //01
NSLog(@"----打印机缺纸-----");
}
}
//下面的处理方式我没处理过，大家可以试试
}
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view from its nib.
......
GeliBusinessPlatform/ViewController/货拉拉/运单详情/WaybillDetailViewController.swift
View file @ ebb2bf19
......@@ -204,8 +204,10 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
}
return 0
}
if section == 5 || section == 6{
if section == 6 {
return 3
}
if section == 5{
return 2
}
if section == 4 {
......@@ -228,6 +230,9 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
let distance = CGFloat((dataModel?.order_detail_item?.exceed_distance)!) / 1000.0
orderPriceArrName.append("超里程价" + "(" + String(format: "%.2f", distance) + "公里" + ")")
orderPriceArrStr.append("¥" + String(format: "%.2f", (rowModel.price_fen!/100.0)))
case 17:
orderPriceArrName.append("其他费用")
orderPriceArrStr.append("¥" + String(format: "%.2f", (rowModel.price_fen!/100.0)))
case 4:
dataModel?.order_detail_item?.spec_req_price_arr?.forEach({ (specModel) in
if specModel.price_fen! != 0 {
......@@ -288,7 +293,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
return 35
}
if indexPath.section == 6{
if indexPath.row == 1 {
if indexPath.row == 2 {
return UITableView.automaticDimension
}
......@@ -429,9 +434,16 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
}else if indexPath.section == 6 {
cell.nameLbl.textColor = UIColor.init(named: "标题字颜色")
cell.textTF.textColor = UIColor.init(named: "灰色字体颜色")
cell.nameLbl.text = "货物保障"
cell.textTF.text = "-"
if indexPath.row == 0 {
cell.nameLbl.text = "支付时间"
cell.textTF.text = dataModel?.delivery?.pay_time
}
if indexPath.row == 1 {
cell.nameLbl.text = "货物保障"
cell.textTF.text = "-"
}
if indexPath.row == 2 {
let cell1 = tableView.dequeueReusableCell(withIdentifier: "TitleAndLblCell") as! TitleAndLblCell
cell1.nameLbl.text = "备注"
cell1.contentLbl.text = dataModel?.order_detail_item?.order_item?.remark
......
GeliBusinessPlatform/ViewController/货拉拉/运单详情/WaybillDetailViewController.xib
View file @ ebb2bf19
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" 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>
......@@ -33,7 +34,7 @@
</tableView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LNV-ad-a6k" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="0.0" y="813" width="414" height="83"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
<color key="value" name="按钮渐变色上"/>
......@@ -57,7 +58,8 @@
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="t9e-fZ-mil" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="1yK-Aa-n27"/>
<constraint firstItem="LNV-ad-a6k" firstAttribute="top" secondItem="t9e-fZ-mil" secondAttribute="bottom" id="A7F-HJ-emZ"/>
......@@ -71,10 +73,14 @@
<constraint firstItem="tOa-jF-wGg" firstAttribute="bottom" secondItem="fnl-2z-Ty3" secondAttribute="bottom" id="sZS-id-ZNc"/>
<constraint firstItem="tOa-jF-wGg" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="x9b-qn-W90"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<point key="canvasLocation" x="131.8840579710145" y="124.55357142857142"/>
</view>
</objects>
<designables>
<designable name="LNV-ad-a6k">
<size key="intrinsicContentSize" width="10" height="10"/>
</designable>
</designables>
<resources>
<namedColor name="app底色">
<color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -88,5 +94,8 @@
<namedColor name="白色背景色">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/采购单列表/CGDListVC.swift
View file @ ebb2bf19
......@@ -260,6 +260,8 @@ class CGDListVC: BaseViewController , UITableViewDelegate, UITableViewDataSource
"chuKuLiang":"" as Any,
"pog_id":item.pog_id as Any,
"no_push_num":item.no_push_num as Any
// "ven_list":item.ven_list as Any
]
let mo = InputInitInfoGoodsInfoModel(JSON: dict)
rkDatas.append(mo!)
......@@ -269,6 +271,8 @@ class CGDListVC: BaseViewController , UITableViewDelegate, UITableViewDataSource
vc.isCaiGou = true
vc.rkSelectArr = rkDatas
vc.po_id = model.po_id!
vc.isCaiGou_GYS_name = model.ven_name!
vc.isCaiGou_GYS_ven_id = model.ven_id!
vc.delegate = self
vc.orderNumStr = model.po_no! as! String
self.navigationController?.pushViewController(vc, animated: true)
......
GeliBusinessPlatform/ViewController/采购单详情/CGDXQVc.swift
View file @ ebb2bf19
......@@ -87,7 +87,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
var po_id:Int?
let tArr = ["制单信息","商品信息"]
var glSelectView:GLAlertSelectView?
var modelD:PurchaseOrderDetailNewModel?
let UserToken = UserDefaults.standard.value(forKey: "user_token")
//MARK: - cell delegate
......@@ -190,6 +190,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
break
case "入库","补录入库":
var rkDatas:Array<InputInitInfoGoodsInfoModel> = []
model!.goods_res?.forEach({ (item) in
if item.no_push_num != 0 {
let dict = [
......@@ -210,15 +211,17 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
"createDayStr":"" as Any,
"chuKuLiang":"" as Any,
"pog_id":item.pog_id as Any,
"no_push_num":item.no_push_num as Any
"no_push_num":item.no_push_num as Any,
]
let mo = InputInitInfoGoodsInfoModel(JSON: dict)
rkDatas.append(mo!)
}
})
let vc = NewRKVc()
vc.isCaiGou = true
vc.isCaiGou_GYS_name = (modelD?.purchase_order?.ven_name)!
vc.isCaiGou_GYS_ven_id = (modelD?.purchase_order?.ven_id)!
print("name= = ",vc.isCaiGou_GYS_name)
vc.rkSelectArr = rkDatas
vc.po_id = model?.po_id! as! Int
vc.delegate = self
......@@ -258,7 +261,7 @@ class CGDXQVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,GLAl
purchaseOrderDetail(dict, success: { (data) in
let item = data as! PurchaseOrderDetailModel
let mo = item.data
self.modelD = item.data
self.holderArr.insert(mo!.purchase_order!.po_no!, at: 0)
self.holderArr.remove(at: 1)
......
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