Skip to content

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

12121212大大的

parent 33fe40c8
Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 19 deletions
GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift
View file @ 0f2d6d0b
......@@ -307,6 +307,7 @@ class OrderDetailGoodsSourceModel: Mappable {
class OrderDetailGoodsModel: Mappable {
var og_id:Int? //订单商品号
var sku_id:String? //
var goods_id : Int? //商品id
var goods_name : String? //商品名
var goods_attr : String? //商品规格
......@@ -326,6 +327,7 @@ class OrderDetailGoodsModel: Mappable {
func mapping(map: Map) {
commission_val <- map["commission_val"]
goods_source <- map["goods_source"]
sku_id <- map["sku_id"]
og_id <- map["og_id"]
goods_id <- map["goods_id"]
goods_name <- map["goods_name"]
......
GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuCell.xib
View file @ 0f2d6d0b
......@@ -243,35 +243,35 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="red_search" translatesAutoresizingMaskIntoConstraints="NO" id="2ax-g5-nsE">
<rect key="frame" x="236.5" y="99" width="18" height="15"/>
<imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="red_search" translatesAutoresizingMaskIntoConstraints="NO" id="2ax-g5-nsE">
<rect key="frame" x="246.5" y="99" width="18" height="15"/>
<constraints>
<constraint firstAttribute="height" constant="15" id="6wd-Is-y0c"/>
<constraint firstAttribute="width" constant="18" id="XOu-iU-64v"/>
</constraints>
</imageView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="jinruDetail" translatesAutoresizingMaskIntoConstraints="NO" id="8zd-iW-KDg">
<imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="jinruDetail" translatesAutoresizingMaskIntoConstraints="NO" id="8zd-iW-KDg">
<rect key="frame" x="355.5" y="102" width="4.5" height="9"/>
<constraints>
<constraint firstAttribute="width" constant="4.5" id="F6Z-j0-3TL"/>
<constraint firstAttribute="height" constant="9" id="a0h-Rz-fch"/>
</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="9q1-sY-v6o">
<rect key="frame" x="259.5" y="97.5" width="91" height="18.5"/>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选择批次号发货" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9q1-sY-v6o">
<rect key="frame" x="269.5" y="97.5" width="91" height="18.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="#F57575"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mWq-Qk-4PK">
<rect key="frame" x="259.5" y="113" width="91" height="1"/>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mWq-Qk-4PK">
<rect key="frame" x="269.5" y="113" width="91" height="1"/>
<color key="backgroundColor" name="#F57575"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="otR-be-ZUZ"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ijb-Bx-Pkl">
<rect key="frame" x="236.5" y="91.5" width="123.5" height="30"/>
<rect key="frame" x="246.5" y="91.5" width="113.5" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="6xO-rP-l1e"/>
</constraints>
......@@ -290,7 +290,7 @@
<constraint firstItem="9q1-sY-v6o" firstAttribute="leading" secondItem="2ax-g5-nsE" secondAttribute="trailing" constant="5" id="5wx-ab-jcR"/>
<constraint firstItem="4lb-rz-I6F" firstAttribute="centerY" secondItem="AWX-Qu-0ML" secondAttribute="centerY" id="6mE-8H-dPD"/>
<constraint firstItem="2zV-nI-93U" firstAttribute="trailing" secondItem="AWX-Qu-0ML" secondAttribute="trailing" id="9vT-N9-JOf"/>
<constraint firstItem="8zd-iW-KDg" firstAttribute="leading" secondItem="9q1-sY-v6o" secondAttribute="trailing" constant="5" id="BfO-GJ-DzW"/>
<constraint firstItem="8zd-iW-KDg" firstAttribute="leading" secondItem="9q1-sY-v6o" secondAttribute="trailing" constant="-5" id="BfO-GJ-DzW"/>
<constraint firstItem="4lb-rz-I6F" firstAttribute="centerX" secondItem="AWX-Qu-0ML" secondAttribute="centerX" id="DtW-X9-NRk"/>
<constraint firstItem="AWX-Qu-0ML" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="20" id="JoA-Ad-gIn"/>
<constraint firstItem="2zV-nI-93U" firstAttribute="top" secondItem="AWX-Qu-0ML" secondAttribute="top" id="L68-da-sK0"/>
......
GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuViewController.swift
View file @ 0f2d6d0b
......@@ -11,7 +11,7 @@ import IQKeyboardManagerSwift
class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,UITableViewDelegate,DaiKeXiaDanFooterViewDelegate,TitleAndBtnCellDelegate,GLAlertSelectViewDelegate,DZGLViewControllerDelegate,XuanZeShangPinViewControllerDelegate,DaiKeXiaDanGouWuCellDelegate,GuanLianKehuVCDelegate,XiuGaiYuShouJiaViewControllerDelegate,TitleAndTFCellDelegate, GeliAlertViewDelegate,UITextFieldDelegate{
func DaiKeXiaDanGouWuCell_select_pi_ci(cell: DaiKeXiaDanGouWuCell) {
print("选择批次")
print("选择批次2")
}
func DaiKeXiaDanGouWuCell_check(cell: DaiKeXiaDanGouWuCell) {
......
GeliBusinessPlatform/ViewController/入库/PiCiXuanZeViewController.swift
View file @ 0f2d6d0b
......@@ -175,6 +175,9 @@ class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableVi
dateLbl.frame = CGRect(x: statusLbl.frame.maxX , y: 0, width: 95, height: 49)
dateLbl.text = "生产日期"
listView.separatorStyle = .none
listView.register(UINib(nibName: "NewPiCiCell", bundle: nil), forCellReuseIdentifier: "NewPiCiCell")
......@@ -211,6 +214,7 @@ class PiCiXuanZeViewController: BaseViewController,UITableViewDelegate,UITableVi
totalCount += item.chuHuoLiang!
}
}
count_Lbl.text = StringByInt(number: totalCount)
}
......
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageDetailViewController.swift
View file @ 0f2d6d0b
......@@ -10,7 +10,7 @@ import UIKit
class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,UITableViewDataSource, DaiKeXiaDanGouWuCellDelegate, S_Y_View_Delegate{
func DaiKeXiaDanGouWuCell_select_pi_ci(cell: DaiKeXiaDanGouWuCell) {
print("选择批次")
print("选择批次3")
}
func S_Y_View_Check_Detail(data: OrderDetailGoodsSourceModel) {
......
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ 0f2d6d0b
......@@ -11,9 +11,31 @@ import Photos
protocol OrderDViewControllerDelegate {
func refishingOrderDchange()
}
class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndBtnCellDelegate,GuanLianKehuVCDelegate,OrderDViewFooterViewDelegate,TitleAndTFCellDelegate,GeliAlertViewDelegate,GLAlertSelectViewDelegate,XiuGaiYuShouJiaViewControllerDelegate,ChangeGoodsPriceVCDelegate,GeliAlertTextFiledDelegate,GeliAlertTextViewDelegate,UpBillDataTableViewCellDelegate, DaiKeXiaDanGouWuCellDelegate, S_Y_View_Delegate {
class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndBtnCellDelegate,GuanLianKehuVCDelegate,OrderDViewFooterViewDelegate,TitleAndTFCellDelegate,GeliAlertViewDelegate,GLAlertSelectViewDelegate,XiuGaiYuShouJiaViewControllerDelegate,ChangeGoodsPriceVCDelegate,GeliAlertTextFiledDelegate,GeliAlertTextViewDelegate,UpBillDataTableViewCellDelegate, DaiKeXiaDanGouWuCellDelegate, S_Y_View_Delegate, PiCiXuanZeViewControllerDelegate {
var piCiArr:Array<Array<GetGoodBatchDataModel>>? = []
func PiCiXuanZeViewControllerPiCiSelect(data: Array<GetGoodBatchDataModel>, p_id: Int) {
piCiArr?.insert(data, at: p_id)
piCiArr?.remove(at: p_id + 1)
listView.reloadData()
}
func DaiKeXiaDanGouWuCell_select_pi_ci(cell: DaiKeXiaDanGouWuCell) {
print("选择批次")
print("选择批次1")
if (self.dataMdoel?.order_res?.order_status == 6 && self.dataMdoel?.order_res?.from != 3 && self.dataMdoel?.order_res?.from != 5){
let model = self.dataMdoel?.order_goods![cell.tag]
let vc = PiCiXuanZeViewController()
vc.sku_id = Int((model?.sku_id)!)
vc.delegate = self
vc.tag = cell.tag
if piCiArr!.count > 0 {
let arr = piCiArr![cell.tag]
vc.recordArr = arr
}
self.navigationController?.pushViewController(vc, animated: true)
}
}
var sufficient_code = -1
......@@ -197,6 +219,10 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}
}
self.piCiArr?.removeAll()
self.dataMdoel?.order_goods?.forEach({ (item) in
self.piCiArr?.append([])
})
if self.dataMdoel?.order_res?.order_status == 2 || self.dataMdoel?.order_res?.order_status == 5{
self.isCaneditLatsData = false
......@@ -494,6 +520,27 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
case 1:
//MARK:--商品cell
let cell = tableView.dequeueReusableCell(withIdentifier: "DaiKeXiaDanGouWuCell") as! DaiKeXiaDanGouWuCell
if (self.dataMdoel?.order_res?.order_status == 6 && self.dataMdoel?.order_res?.from != 3 && self.dataMdoel?.order_res?.from != 5){
let arr = piCiArr![indexPath.row]
if arr.count > 0 {
cell.non_add_icon.isHidden = true
cell.text_line.isHidden = true
cell.right_margin.constant = 5
cell.text_line.isHidden = true
cell.already_add_icon.isHidden = false
cell.status_text_lbl.textColor = UIColor(named: "多选按钮字体颜色")
}else{
cell.non_add_icon.isHidden = false
cell.already_add_icon.isHidden = true
cell.text_line.isHidden = false
cell.status_text_lbl.isHidden = false
cell.right_margin.constant = -5
cell.status_text_lbl.textColor = UIColor(named: "#F57575")
}
}
cell.delegate = self
cell.isDetail = true
let rowModel = self.dataMdoel?.order_goods![indexPath.row]
......@@ -507,7 +554,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
cell.btm_line.isHidden = true
}
}
// cell.check_button.isHidden = false
// cell.check_button.isHidden = false
cell.imgView?.sd_setImage(with: URL(string: SERVERCE_ImageHost + (rowModel?.goods_thumb)!))
cell.content_tv.text = rowModel?.remark
cell.titleLbl.text = rowModel?.goods_name
......@@ -838,7 +885,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
cell.textTF.text = "自提"
}
break
case (9 + isYushoucount):
cell.textTF.text = self.dataMdoel?.order_res?.postscript
break
......@@ -1263,7 +1310,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}
return 310
}
if (target?.goods_source!.count)! > 0 {
return 300
}
......@@ -1740,13 +1787,54 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}
}else{
var goodsInfoArr:Array<Any> = []
for i in 0 ..< (dataMdoel?.order_goods?.count)! {
let item = dataMdoel?.order_goods![i]
var count = 0
let pici = piCiArr![i]
if pici.count == 0 {
HUD.flash(.label("请选择出库商品批次"), delay: 1.2)
return
}
for data in pici {
count += data.chuHuoLiang!
}
var batchInfo:Array<Any> = []
piCiArr!.forEach { (batchArr) in
batchArr.forEach { (model) in
let batch = [
"w_id":model.w_id as Any,
"p_id":model.p_id as Any,
"number":model.chuHuoLiang as Any,
"production_data":model.production_data as Any,
"shelf_life":model.shelf_life as Any,
"valid_date":model.valid_date as Any,
"batch_id":model.batch_id as Any,
"report_id":model.report_id as Any,
"ven_id":model.ven_id as Any
]
batchInfo.append(batch)
}
}
let goods = [
"goods_id":item!.goods_id as Any,
"goods_name":item!.goods_name as Any,
"goods_spec":item!.goods_attr as Any,
"sku_id":item!.sku_id as Any,
"number":count as Any,
"batch_info":batchInfo as Any,
]
goodsInfoArr.append(goods)
}
sendOut(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any,"goods_info":[] as Any], success: { (data) in
sendOut(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any,"goods_info":dataChangeString(sender: goodsInfoArr) as Any], success: { (data) in
HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
self.delegate?.refishingOrderDchange()
self.loadData()
}) { (error) in
......
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