Skip to content

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

禅道bug修复

parent ebb2bf19
Show whitespace changes
Inline Side-by-side
Showing with 301 additions and 46 deletions
GeliBusinessPlatform/Interface/Interface_Z.plist
View file @ 77695bc6
......@@ -328,5 +328,7 @@
<string>Order/changePrintInfo</string>
<key>分销订单退款特殊处理</key>
<string>Order/fullCommissionInquiry</string>
<key>库存详情</key>
<string>goods/inventoryDetails</string>
</dict>
</plist>
GeliBusinessPlatform/Model/GoodsInterface.swift
View file @ 77695bc6
......@@ -101,3 +101,16 @@ func goodsEdit(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:
failture(error)
}
}
//MARK:--库存详情
//params-key(user_token)
//sku_id 商品suk_id
func inventoryDetails(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("库存详情", params, { (rep:DataResponse<inventoryDetailsModel>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
GeliBusinessPlatform/Model/GoodsManageMoel/GoodsDetailModel.swift
View file @ 77695bc6
......@@ -183,3 +183,73 @@ class GoodsDetailBannerResModel: Mappable {
img_original <- map["img_original"]
}
}
//库存详情
class inventoryDetailsModel: Mappable {
var code:Int?
var message : String?
var data : Array<inventoryDetailsDataModel>?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class inventoryDetailsDataModel: Mappable {
///批次号id
var batch_id:Int?
///商品格利批次号
var batch_sn : String?
///商品状态
var status :String?
///库存数量
var inventory:Int?
///仓位
var w_id : Int?
///库位
var p_id : Int?
///保存日期
var shelf_life:Int?
///入库时间
var add_time : String?
///商品生产日期
var production_data : String?
///商品过期日期
var valid_date:String?
///检测报告（图url）
var file_url : String?
///仓库名
var w_name : String?
///库位名
var p_name : String?
required init?( map: Map) {
}
func mapping(map: Map) {
batch_id <- map["batch_id"]
batch_sn <- map["batch_sn"]
status <- map["status"]
inventory <- map["inventory"]
w_id <- map["w_id"]
p_id <- map["p_id"]
shelf_life <- map["shelf_life"]
add_time <- map["add_time"]
production_data <- map["production_data"]
valid_date <- map["valid_date"]
file_url <- map["file_url"]
w_name <- map["w_name"]
p_name <- map["p_name"]
}
}
GeliBusinessPlatform/View/Cell/CRKCell.xib
View file @ 77695bc6
<?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>
......@@ -79,7 +80,7 @@
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Jiv-tY-lF3">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Jiv-tY-lF3">
<rect key="frame" x="242" y="94.5" width="80" height="30"/>
<color key="backgroundColor" name="蓝色字体颜色"/>
<constraints>
......@@ -99,7 +100,7 @@
<action selector="btnClick:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="ler-i4-ual"/>
</connections>
</button>
<button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7d3-0e-5Mj">
<button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7d3-0e-5Mj">
<rect key="frame" x="147" y="94.5" width="80" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="80" id="BVs-aO-isk"/>
......@@ -125,7 +126,7 @@
</connections>
</button>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="FEl-Gz-NfW" firstAttribute="top" secondItem="RWk-dO-ESH" secondAttribute="top" constant="15" id="1pe-bO-neq"/>
<constraint firstItem="oLa-7N-YOz" firstAttribute="top" secondItem="uLZ-ZH-Ei8" secondAttribute="bottom" id="98X-pk-dIJ"/>
......@@ -169,8 +170,8 @@
<constraint firstAttribute="trailing" secondItem="RWk-dO-ESH" secondAttribute="trailing" constant="15" id="vaI-Ss-Zs8"/>
</constraints>
</tableViewCellContentView>
<color key="backgroundColor" name="app底色"/>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<color key="backgroundColor" name="app底色"/>
<connections>
<outlet property="btmH" destination="VY6-bw-wQ0" id="TUp-7g-nvg"/>
<outlet property="countLbl" destination="b9u-3C-XDx" id="yT9-z9-cgA"/>
......@@ -205,5 +206,8 @@
<namedColor name="蓝色字体颜色">
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/1.1入库&出库/NewSelectItemVc.swift
View file @ 77695bc6
......@@ -8,7 +8,7 @@
import UIKit
protocol NewSelectItemVcDelegate {
func NewSelectItemVcSelect(datas:Array<InputInitInfoGoodsInfoModel>,pici:Array<Array<GetGoodBatchDataModel>>,select:Array<Int>,str:Array<String>)
func NewSelectItemVcSelect(datas:Array<InputInitInfoGoodsInfoModel>,pici:Array<Array<GetGoodBatchDataModel>>,select:Array<Int>,str:Array<String>,typeArr:Array<Int>,imgArr:Array<String>)
}
class NewSelectItemVc: BaseViewController,UITableViewDelegate,UITableViewDataSource{
var isRuKu = false
......@@ -16,6 +16,8 @@ class NewSelectItemVc: BaseViewController,UITableViewDelegate,UITableViewDataSou
var rkSelectArr:Array<InputInitInfoGoodsInfoModel> = []
var select_ven_list:Array<Int> = []
var report_sn_arr:Array<String> = []
var report_img_arr:Array<String> = []
var report_type_arr:Array<Int> = []
var tempRecord:Array<Int> = []
var recordArr:Array<Array<GetGoodBatchDataModel>> = []{
didSet{
......@@ -38,9 +40,11 @@ class NewSelectItemVc: BaseViewController,UITableViewDelegate,UITableViewDataSou
}
}
}
delegate?.NewSelectItemVcSelect(datas: rkSelectArr, pici: recordArr,select:select_ven_list,str:report_sn_arr)
delegate?.NewSelectItemVcSelect(datas: rkSelectArr, pici: recordArr,select:select_ven_list,str:report_sn_arr,typeArr:report_type_arr,imgArr:report_img_arr)
self.navigationController?.popViewController(animated: true)
}
@IBOutlet weak var listView: UITableView!
@IBOutlet weak var searchBg: UIView!
override func viewDidLoad() {
......@@ -50,6 +54,9 @@ class NewSelectItemVc: BaseViewController,UITableViewDelegate,UITableViewDataSou
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.
}
......@@ -94,6 +101,8 @@ class NewSelectItemVc: BaseViewController,UITableViewDelegate,UITableViewDataSou
if select_ven_list.count > 0 {
select_ven_list.remove(at: idx!)
report_sn_arr.remove(at: idx!)
report_img_arr.remove(at: idx!)
report_type_arr.remove(at: idx!)
}
if !isRuKu {
tempRecord.insert(10086, at: idx!)
......@@ -102,6 +111,8 @@ class NewSelectItemVc: BaseViewController,UITableViewDelegate,UITableViewDataSou
}else{
rkSelectArr.append(data)
report_sn_arr.append("")
report_img_arr.append("")
report_type_arr.append(-1)
if data.ven_list?.count == 1 {
select_ven_list.append(0)
}else{
......
GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewRKVc.swift
View file @ 77695bc6
......@@ -14,6 +14,11 @@ protocol NewRKVcDelegate {
func NewRKVcFinish()
}
class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, NewOnlyRKCellDelegate,NewSelectItemVcDelegate,NewSelectWarehouseVCDelegate,GLAlertSelectViewDelegate,GeliAlertTextViewDelegate, ShowTimeSelectViewDelegate, GYSListViewControllerDelegate, GYSGLViewControllerDelegate, Add_Report_View_Delegate{
func Add_Report_View_Close(view: Add_Report_View) {
report_view?.removeFromSuperview()
report_view = nil
}
var isCaiGou_GYS_name:String = ""
var isCaiGou_GYS_ven_id:Int = -1
var select_ven_list:Array<Int> = []
......@@ -67,7 +72,8 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
report_view?.imgs_datas = maxFiveImgsArr
report_view?.layoutIfNeeded()
}
var report_img_arr:Array<String> = []
var report_type_arr:Array<Int> = []
var report_sn_arr:Array<String> = []
func Add_Report_View_Submit_Action(view: Add_Report_View) {
var lastGoodsBanner:Array<String> = []
......@@ -81,8 +87,10 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
// goods_bannerStr = dataChangeString(sender: lastGoodsBanner)
goods_bannerStr = lastGoodsBanner.joined(separator: ",")
}
// report_sn = view.report_sn_tf.text!
report_type_arr.insert(view.select_idx!, at: view.tag)
report_type_arr.remove(at: view.tag + 1)
report_img_arr.insert(goods_bannerStr, at: view.tag)
report_img_arr.remove(at: view.tag + 1)
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]
......@@ -107,7 +115,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
}
func NewSelectItemVcSelect(datas: Array<InputInitInfoGoodsInfoModel>, pici: Array<Array<GetGoodBatchDataModel>>,select:Array<Int>,str:Array<String>) {
func NewSelectItemVcSelect(datas: Array<InputInitInfoGoodsInfoModel>, pici: Array<Array<GetGoodBatchDataModel>>,select:Array<Int>,str:Array<String>,typeArr:Array<Int>,imgArr:Array<String>) {
rkSelectArr.removeAll()
datas.forEach { (model) in
rkSelectArr.append(model)
......@@ -116,6 +124,17 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
str.forEach { (item) in
report_sn_arr.append(item)
}
report_img_arr.removeAll()
imgArr.forEach { (item) in
report_img_arr.append(item)
}
report_type_arr.removeAll()
typeArr.forEach { (item) in
report_type_arr.append(item)
}
select_ven_list.removeAll()
select.forEach { (item) in
select_ven_list.append(item)
......@@ -517,7 +536,12 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
self.report_sn_arr.removeAll()
self.select_ven_list.removeAll()
self.report_img_arr.removeAll()
self.report_type_arr.removeAll()
self.rkSelectArr.forEach { (item) in
self.report_img_arr.append("")
self.report_type_arr.append(-1)
self.report_sn_arr.append("")
if item.ven_list?.count == 1 {
self.select_ven_list.append(0)
......@@ -706,7 +730,7 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
}
let report_sn = report_sn_arr[indexPath.row]
if report_sn.count != 0 {
cell.btn_title_lbl.text = "sn:" + report_sn
cell.btn_title_lbl.text = "查看"
}
cell.gys_name_lbl.text = "请选择供应商"
cell.gys_arrow.isHidden = false
......@@ -733,8 +757,6 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
}
}
return cell
}
......@@ -808,18 +830,36 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
data.createDay = Int(timeInterval)
data.createDayStr = timeStr
listView.reloadData()
}
var report_view:Add_Report_View?
func NewOnlyRKCellAddRepord(cell: NewOnlyRKCell) {
//添加检测报告
print("添加检测报告")
if report_view == nil {
let vc = Add_Report_View(frame: self.view.bounds)
vc.delegate = self
let sn = report_sn_arr[cell.tag]
if sn.count != 0 {
vc.report_sn_tf.text = sn
}
let idx = report_type_arr[cell.tag]
if idx != -1 {
vc.select_idx = idx
}
let imglnks = report_img_arr[cell.tag]
maxFiveImgsArr.removeAll()
if imglnks.count != 0 {
vc.imgs_datas = imglnks.components(separatedBy: ",")
vc.imgs_datas.forEach { (item) in
maxFiveImgsArr.append(item)
}
}
vc.tag = cell.tag
self.view.addSubview(vc)
report_view = vc
report_view?.layoutIfNeeded()
}
}
......@@ -828,6 +868,8 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
rkSelectArr.remove(at: cell.tag)
select_ven_list.remove(at: cell.tag)
report_sn_arr.remove(at: cell.tag)
report_img_arr.remove(at: cell.tag)
report_type_arr.remove(at: cell.tag)
listView.reloadData()
}
......@@ -878,6 +920,8 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
vc.rkSelectArr = rkSelectArr
vc.select_ven_list = select_ven_list
vc.report_sn_arr = report_sn_arr
vc.report_img_arr = report_img_arr
vc.report_type_arr = report_type_arr
self.navigationController?.pushViewController(vc, animated: true)
}
// func getStrHeight(str:String) -> CGFloat{
......@@ -1024,7 +1068,6 @@ 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()
......
GeliBusinessPlatform/ViewController/1.1入库&出库/出库/NewCKVc.swift
View file @ 77695bc6
......@@ -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>>,select:Array<Int>,str:Array<String>) {
func NewSelectItemVcSelect(datas: Array<InputInitInfoGoodsInfoModel>, pici: Array<Array<GetGoodBatchDataModel>>,select:Array<Int>,str:Array<String>,typeArr:Array<Int>,imgArr:Array<String>) {
rkSelectArr.removeAll()
datas.forEach { (item) in
rkSelectArr.append(item)
......
GeliBusinessPlatform/ViewController/出入库记录/CRKListVC.swift
View file @ 77695bc6
......@@ -11,6 +11,7 @@ import ViewAnimator //cell动效
class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CRKCellDelegate,UISearchBarDelegate, SearchBarViewDelegate,CRKXiangQVCDelegate ,MoreAndTimeSelectViewDelegate,GeliAlertTextViewDelegate,GeliAlertViewDelegate{
let UserToken = UserDefaults.standard.value(forKey: "user_token")
var isRequest = false
func sureGeliAlertViewAction(sender: UIButton) {
//MARK: - 出入库列表 iog_id
......@@ -433,7 +434,10 @@ class CRKListVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,CR
vc.delegate = self
vc.status = model.status
vc.model = model
vc.io_type = model.io_type
if isRequest {
vc.isRequest = isRequest
}
if model.io_type == 1 && auth.contains("122"){//入库
vc.isGm = true
......
GeliBusinessPlatform/ViewController/出入库记录/CRKXiangQVC.swift
View file @ 77695bc6
......@@ -11,6 +11,7 @@ protocol CRKXiangQVCDelegate {
func CRKXiangQVCFinishAction()
}
class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,NewCKCellDelegate,PiCiXuanZeViewControllerDelegate,WarehoseMangementListVCDelegate,GLAlertSelectViewDelegate,GeliAlertTextViewDelegate,GeliAlertViewDelegate{
var isRequest = false
var w_id:Int?
var p_id:Int?
var w_name:String?
......@@ -77,6 +78,7 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
var wareHouseModel:ShopWarehouseListDataModel?//仓库
var isGm:Bool?
var status:Int?
var io_type:Int?
var piCiArr:Array<Array<GetGoodBatchDataModel>> = []//批次
@IBOutlet weak var btmView: UIView!
@IBOutlet weak var listView: UITableView!
......@@ -460,7 +462,7 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
return cell
}
print("abc=== ",model?.io_type,model?.status)
if model?.io_type == 1 || (model?.status!)! > 1 { //入库
let cell = tableView.dequeueReusableCell(withIdentifier: "NewRKCell") as! NewRKCell
......@@ -514,10 +516,24 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
cell.baogao.text = "报告:" + "\(data.report_sn!)"
}
if isRequest {
cell.pi_ci_lbl.isHidden = true
cell.line_view.isHidden = true
cell.lbl_btm.constant = 0
cell.lbl_top.constant = 0
cell.lbl_height.constant = 0
}else{
cell.pi_ci_lbl.isHidden = false
cell.line_view.isHidden = false
cell.lbl_btm.constant = 15
cell.lbl_top.constant = 15
cell.lbl_height.constant = 18.5
cell.pi_ci_lbl.text = "商品批次:无"
if data.batch_sn != nil {
cell.pi_ci_lbl.text = "商品批次:" + data.batch_sn!
}
}
cell.gys_lbl.text = "供应商:无"
if data.ven_name != nil {
......@@ -567,10 +583,24 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
cell.baogao.text = "报告:" + "\(model.report_sn!)"
}
if model.batch_id! == 0 {
cell.pi_ci_lbl.isHidden = true
cell.line_view.isHidden = true
cell.lbl_btm.constant = 0
cell.lbl_top.constant = 0
cell.lbl_height.constant = 0
}else{
cell.pi_ci_lbl.isHidden = false
cell.line_view.isHidden = false
cell.lbl_btm.constant = 15
cell.lbl_top.constant = 15
cell.lbl_height.constant = 18.5
cell.pi_ci_lbl.text = "商品批次:无"
if model.batch_id != nil {
cell.pi_ci_lbl.text = "商品批次:" + "\(model.batch_id!)"
}
}
cell.gys_lbl.text = "供应商:无"
if model.ven_name != nil {
......@@ -624,11 +654,23 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
}
cell.baogao.isHidden = true
if model.batch_id! == 0 {
cell.pi_ci_lbl.isHidden = true
cell.line_view.isHidden = true
cell.lbl_btm.constant = 0
cell.lbl_top.constant = 0
cell.lbl_height.constant = 0
}else{
cell.pi_ci_lbl.isHidden = false
cell.line_view.isHidden = false
cell.lbl_btm.constant = 15
cell.lbl_top.constant = 15
cell.lbl_height.constant = 18.5
cell.pi_ci_lbl.text = "商品批次:无"
if model.batch_id != nil {
cell.pi_ci_lbl.text = "商品批次:" + "\(model.batch_id!)"
}
}
cell.gys_lbl.text = "供应商:无"
if model.ven_name != nil {
cell.gys_lbl.text = "供应商:" + "\(model.ven_name!)"
......@@ -679,6 +721,11 @@ class CRKXiangQVC: BaseViewController,UITableViewDelegate,UITableViewDataSource,
if indexPath.section == 0{
return 49
}
if isRequest || (status == 1 && io_type == 1) {
return 313.5
}
if model?.io_type == 1 {//入库
return 362
}
......
GeliBusinessPlatform/ViewController/出入库记录/NewRKCell.swift
View file @ 77695bc6
......@@ -10,6 +10,10 @@ import UIKit
class NewRKCell: UITableViewCell {
@IBOutlet weak var line_view: UIView!
@IBOutlet weak var lbl_btm: NSLayoutConstraint!
@IBOutlet weak var lbl_top: NSLayoutConstraint!
@IBOutlet weak var lbl_height: NSLayoutConstraint!
@IBOutlet weak var pi_ci_lbl: UILabel!
@IBOutlet weak var gys_lbl: UILabel!
@IBOutlet weak var baogao: UILabel!
......
GeliBusinessPlatform/ViewController/出入库记录/NewRKCell.xib
View file @ 77695bc6
......@@ -259,6 +259,10 @@
<outlet property="gqrq" destination="QRv-d2-EeB" id="C2M-hO-OXp"/>
<outlet property="guiGe" destination="JKO-tV-H9B" id="IV8-y3-lhT"/>
<outlet property="gys_lbl" destination="7YJ-pG-OWQ" id="C5y-Tb-AWb"/>
<outlet property="lbl_btm" destination="unQ-FX-dhe" id="idl-k5-jh1"/>
<outlet property="lbl_height" destination="Cka-T1-bE3" id="5Xe-hn-4ML"/>
<outlet property="lbl_top" destination="4QG-Bq-IaD" id="zzY-Zs-TIY"/>
<outlet property="line_view" destination="ypA-b2-3oH" id="hmF-TE-Ayf"/>
<outlet property="nameLbl" destination="lUj-PO-NbV" id="lxc-dd-qQ7"/>
<outlet property="pi_ci_lbl" destination="QfU-XN-RsA" id="kSe-7L-Jum"/>
<outlet property="rkjg" destination="7Kz-gN-GMZ" id="dxL-Ks-BB2"/>
......
GeliBusinessPlatform/ViewController/商品库存/S_P_K_C_Detail_Vc.swift
View file @ 77695bc6
......@@ -12,7 +12,7 @@ class S_P_K_C_Detail_Vc: BaseViewController,UICollectionViewDelegate,UICollectio
var titles = ["商品格利批次号","商品状态","库存数量","仓库","库位","保质期","入库时间","商品生产日期","商品过期日期","检测报告"]
var datasArr:Array<Int> = [1,2,3]
var datasArr:Array<inventoryDetailsDataModel> = []
@IBOutlet weak var topBarViewH: NSLayoutConstraint!
@IBOutlet weak var topBarView: UIView!
......@@ -111,15 +111,47 @@ class S_P_K_C_Detail_Vc: BaseViewController,UICollectionViewDelegate,UICollectio
return 49
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let model = datasArr[selectIdx.row]
if indexPath.row == 9 {
let cell = tableView.dequeueReusableCell(withIdentifier: "S_P_K_C_Report_Cell") as! S_P_K_C_Report_Cell
cell.nameLbl.text = titles[indexPath.row]
cell.img_view.image = UIImage(named: "blue_add")
if model.file_url != nil {
cell.img_view.sd_setImage(with:URL(string:SERVERCE_ImageHost + model.file_url!))
}
return cell
}
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndLblCell") as! TitleAndLblCell
cell.nameLbl.text = titles[indexPath.row]
cell.contentLbl.text = StringByInt(number: datasArr[selectIdx.row])
switch indexPath.row {
case 0:
cell.contentLbl.text = model.batch_sn
break
case 1:
cell.contentLbl.text = model.status
break
case 2:
cell.contentLbl.text = StringByInt(number: model.inventory!)
break
case 3:
cell.contentLbl.text = model.w_name
break
case 4:
cell.contentLbl.text = model.p_name
break
case 5:
cell.contentLbl.text = StringByInt(number: model.shelf_life!)
break
case 6:
cell.contentLbl.text = model.add_time
break
case 7:
cell.contentLbl.text = model.production_data
break
case 8:
cell.contentLbl.text = model.valid_date
default:
break
}
return cell
}
}
GeliBusinessPlatform/ViewController/商品详情/EPViewController.swift
View file @ 77695bc6
......@@ -980,8 +980,18 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if indexPath.row == 4 {
//MARK: - 查看库存详情
inventoryDetails(["user_token":UserToken as Any,"sku_id":sku_id as Any]) { (data) in
let vc = S_P_K_C_Detail_Vc()
let model = data as! inventoryDetailsModel
if model.data!.count > 0 {
vc.datasArr = model.data!
}
self.navigationController?.pushViewController(vc, animated: true)
} failture: { (err) in
}
}
}
//MARK: - 底部广告软文跳转 && 编辑
......
GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift
View file @ 77695bc6
......@@ -405,6 +405,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
let vc = CRKListVC()
vc.status = 1
vc.io_type = 1
vc.isRequest = true
self.navigationController?.pushViewController(vc, animated: true)
return
case 3:
......
GeliBusinessPlatform/ViewController/库存商品（库存商品的出库）/KuCunShangPinCell.xib
View file @ 77695bc6
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" 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>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<deployment identifier="iOS"/>
<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"/>
......@@ -10,7 +11,7 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="KuCunShangPinCell" customModule="GeliBusinessPlatform" customModuleProvider="target">
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="KuCunShangPinCell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="375" height="120"/>
<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">
......@@ -118,10 +119,10 @@
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色字体颜色">
<color red="0.40000000596046448" green="0.40000000596046448" blue="0.40000000596046448" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<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/库存商品（库存商品的出库）/KuCunXiangQingCell.xib
View file @ 77695bc6
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" 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>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<deployment identifier="iOS"/>
<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>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="260" id="KGk-i7-Jjw" customClass="KuCunXiangQingCell" customModule="GeliBusinessPlatform" customModuleProvider="target">
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="260" id="KGk-i7-Jjw" customClass="KuCunXiangQingCell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="375" height="250"/>
<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">
......@@ -113,7 +115,7 @@
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tCS-4C-wBF">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tCS-4C-wBF">
<rect key="frame" x="259.5" y="117" width="54" height="28"/>
<constraints>
<constraint firstAttribute="height" constant="28" id="cZC-PO-dQP"/>
......@@ -144,7 +146,7 @@
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nJe-xf-H5k">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nJe-xf-H5k">
<rect key="frame" x="240" y="166.5" width="80" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="3eH-ni-lKh"/>
......@@ -168,7 +170,7 @@
</connections>
</button>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="nJe-xf-H5k" firstAttribute="centerY" secondItem="RoD-DY-SZk" secondAttribute="centerY" id="009-Vf-ovb"/>
<constraint firstItem="hE7-KG-Utr" firstAttribute="top" secondItem="COk-aR-ifm" secondAttribute="bottom" constant="10" id="0tt-bs-oSx"/>
......@@ -243,20 +245,17 @@
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" 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"/>
</namedColor>
<namedColor name="灰色分界线">
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色字体颜色">
<color red="0.40000000596046448" green="0.40000000596046448" blue="0.40000000596046448" 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.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>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/溯源/Add_Report_View.swift
View file @ 77695bc6
......@@ -11,14 +11,13 @@ import LGButton
protocol Add_Report_View_Delegate {
func Add_Report_View_Select_Img(view:Add_Report_View)
func Add_Report_View_Submit_Action(view:Add_Report_View)
func Add_Report_View_Close(view:Add_Report_View)
func Add_Report_View_ChangeImg(view:Add_Report_View,idx:Int)
func Add_Report_View_DelImg(view:Add_Report_View,idx:Int)
}
class Add_Report_View: UIView {
@IBOutlet weak var btm_view: UIView!
var scrollView = UIScrollView()
override func layoutIfNeeded() {
......@@ -75,6 +74,17 @@ class Add_Report_View: UIView {
didSet{
if select_idx != nil {
select_img.isHidden = false
switch select_idx {
case 0:
type_lbl.text = "检验检测报告"
break
case 1:
type_lbl.text = "关检报告"
break
default:
type_lbl.text = "检验检疫合格证"
break
}
}
}
}
......@@ -114,7 +124,7 @@ class Add_Report_View: UIView {
select_view.isHidden = !select_view.isHidden
}
@IBAction func close_action(_ sender: UIButton) {
self.removeFromSuperview()
delegate?.Add_Report_View_Close(view: self)
}
@IBOutlet weak var type_lbl: UILabel!
var contentView:UIView!
......
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