Browse Source

Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp

# Conflicts:
#	static/config.json
wms3.0_pda
niexiting 12 months ago
parent
commit
769fc32d9a
  1. 10
      api/request2.js
  2. 19
      mycomponents/popup/selectList.vue
  3. 1
      mycomponents/scan/winScanPackAndLocation.vue
  4. 9
      pages.json
  5. 87
      pages/deliver/coms/comDeliverRequestCreator.vue
  6. 272
      pages/deliver/coms/comDeliverRequestPopup.vue
  7. 86
      pages/deliver/record/deliverRecord.vue
  8. 2
      pages/deliver/request/deliverRequest.vue
  9. 222
      pages/deliver/request/deliverRequestCreate.vue
  10. 3
      pages/purchaseReturn/record/returnRecord.vue
  11. 3
      static/config.json

10
api/request2.js

@ -373,6 +373,16 @@ export function getWorkShopLineStation() {
});
}
/**
* 查询客户物品
*/
export function getCustomerItemList(params) {
return request({
url: baseApi + "/wms/customeritem/senior",
method: "post",
data: params,
});
}

19
mycomponents/popup/selectList.vue

@ -31,7 +31,8 @@
<script>
import {
getProductionlineItem
getProductionlineItem,
getCustomerItemList
} from '@/api/request2.js';
import comPopup from '@/mycomponents/common/comPopup.vue'
export default {
@ -53,15 +54,23 @@
},
methods: {
queryList(lineCode){
var filters =[]
filters.push({
column: "customerCode",
action: "==",
value: lineCode
})
var params = {
productionLineCode: lineCode,
filters: filters,
pageNo: this.pageCurrent,
pageSize: this.pageSize
pageSize: this.pageSize,
}
getProductionlineItem(params).then(res => {
getCustomerItemList(params).then(res => {
if (res.data != null && res.data.list.length > 0) {
this.showList = res.data.list;
this.total =res.data.total;
this.total = res.data.total;
this.$forceUpdate()
this.$refs['popupItems'].open("center");
} else {
//线

1
mycomponents/scan/winScanPackAndLocation.vue

@ -117,6 +117,7 @@
} else {
this.locationGetFocus();
}
this.fromInventoryStatuses = this.businessType.outInventoryStatuses
this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //
this.fromLocationTypeArray = getDirectoryItemArray(this.businessType.outLocationTypes); //
this.$refs.popup.open('bottom');

9
pages.json

@ -1422,6 +1422,15 @@
"enablePullDownRefresh": false
}
},
{
"path": "pages/deliver/request/deliverRequestCreate",
"style": {
"navigationBarTitleText": "成品发货申请创建",
"enablePullDownRefresh": false
}
},
{
"path": "pages/customerReturn/job/returnJob",

87
pages/deliver/coms/comDeliverRequestCreator.vue

@ -0,0 +1,87 @@
<template>
<view class="">
<uni-collapse ref="collapse">
<uni-collapse-item :open="true">
<template v-slot:title>
<view class="" style="font-size: 32rpx;">
<view class="" >
客户 : {{dataContent.customerName}} ({{dataContent.customerCode}})
</view>
<view class="">
总数量 : {{dataContent.totalQty}}
</view>
</view>
</template>
<u-line />
<uni-swipe-action ref="swipeAction">
<view v-for="(item, index) in dataContent.subList" :key="index">
<uni-swipe-action-item>
<view class="" style="font-size: 32rpx;margin: 10rpx;">
<view class="">
物品代码 : {{item.itemCode}}
</view>
<view class="">
物品名称 : {{item.itemName}}
</view>
<view class="uni-flex uni-row uni-center">
<view class="">
数量 : {{item.qty}} 单位 :
</view>
<view class="">
<uom :uom="item.uom"></uom>
</view>
</view>
</view>
</uni-swipe-action-item>
<u-line />
</view>
</uni-swipe-action>
</uni-collapse-item>
</uni-collapse>
</view>
</template>
<script>
import uom from '@/mycomponents/qty/uom.vue'
export default {
components: {
uom
},
data() {
return {
}
},
props: {
dataContent: {
type: Object,
default: {}
},
},
methods: {
update(){
this.$nextTick(r => {
this.$refs.collapse.resize()
});
}
}
}
</script>
<style>
</style>

272
pages/deliver/coms/comDeliverRequestPopup.vue

@ -0,0 +1,272 @@
<template>
<view class="">
<uni-popup ref="popup" :maskClick="false">
<view class="uni-flex uni-column pop_customer">
<view class="" style="padding:10rpx">
<view class="uni-flex u-col-center uni-row space-between" style="padding: 10rpx 10rpx 20rpx 10rpx">
<view class="" style="font-size: 35rpx;">
{{title}}
</view>
<image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg"
@click="closeRequestPopup()"></image>
</view>
<u-line />
<view class="uni-flex uni-column" style="background-color: white; ">
<view class="uni-flex uni-column ">
<view class="uni-flex uni-row padding title u-col-center">
<text>客户 : </text>
<view class="uni-flex u-col-center uni-row" @click="showSelect">
<view class="" style="margin-left: 20rpx;">
{{customerName}}
</view>
<u-select v-model="showCustomer" mode="single-column" :list="customerList"
@confirm="confirmSelect"></u-select>
</view>
</view>
<u-line />
<view class="uni-flex uni-row padding title u-col-center">
<text>零件 : </text>
<view class="uni-flex u-col-center uni-row">
<u-input v-model="itemCode" :focus="itemCodeFocus" :border="true"
placeholder="请输入需求零件" @confirm="itemCodeConfirm" />
<image src="/static/search.svg" mode=""
style=" width: 40rpx;height: 40rpx;margin-left: 10rpx;" @click="itemCodeClick">
</image>
</view>
</view>
<u-line />
<view class="uni-flex uni-row padding title u-col-center">
<text>数量 : </text>
<view class="uni-flex uni-row uni-center"
style="align-items: center;margin-left: 20rpx;">
<uni-number-box :value="counQty" @change="change" style='margin-left: 10rpx;'
:focus="numberFocus" @blur='numberFocus = false'>
</uni-number-box>
<uom :uom="uom"></uom>
</view>
</view>
<u-line />
</view>
</view>
</view>
<view class="uni-flex uni-row hide_border">
<button class="btn_edit_big_cancle" hover-class="btn_edit_big_after" @click="cancel()">取消</button>
<button class="btn_edit_big_confirm" hover-class="btn_edit_big_after" @click="confirm()">确认</button>
</view>
</view>
</uni-popup>
<comMessage ref="comMessage"></comMessage>
<selectList ref='selectList' @selectedItem="selectedItem"></selectList>
</view>
</template>
<script>
import {
getBasicLocationByCode,
getBasicItemByCode,
getProductionlineItem,
getWorkShopLineStation,
getBasicCustomerList,
} from '@/api/request2.js';
import {
getLocationTypeName,
getListLocationTypeDesc,
checkDirectoryItemExist
} from '@/common/directory.js';
import uom from '@/mycomponents/qty/uom.vue'
import balanceStatus from '@/mycomponents/status/balanceStatus.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
import selectList from '@/mycomponents/popup/selectList.vue'
export default {
components: {
uom,
balanceStatus,
comMessage,
selectList
},
data() {
return {
// itemCode: 'CE115F11161AG',
itemCode: '',
itemName: "",
qty: 0,
itemCodeFocus: false,
requestInfo: null,
itemCodeList: [],
isCheckItemCode: false,
counQty: 0,
editPosition: true,
numberFocus: false,
uom: "",
showCustomer: false,
isModifiedPosition: true,
customerList: [],
customerName: "请选择客户",
customerCode:""
}
},
props: {
title: {
type: String,
default: '需求信息'
},
},
methods: {
openRequestPopup(editPosition) {
if (this.customerList.length == 0) {
getBasicCustomerList().then(res => {
if (res.data.length > 0) {
var list = res.data;
list.forEach(item => {
item.label = item.name
item.value = item.code
})
this.customerList = list;
}
}).catch(error => {
})
}
this.editPosition = editPosition;
if (this.isModifiedPosition) {
this.isModifiedPosition = false
} else {
this.itemCode = "";
this.uom = ""
this.qty = 0
this.itemCodeGetFocus();
}
this.$refs.popup.open('bottom')
},
closeRequestPopup() {
this.$refs.popup.close()
},
locationConfirm() {
//
this.checkLocatioCode();
},
itemCodeClick() {
if (this.customerName == "请选择客户") {
this.showErrorMessage("请选择客户")
return
}
this.$refs.selectList.queryList(this.customerCode)
},
itemCodeGetFocus() {
this.itemCodeFocus = true;
},
itemCodeLoseFocus() {
this.itemCodeFocus = false;
},
selectedItem(item) {
this.itemCode = item.itemCode;
this.checkItemCode();
},
confirm() {
if (this.itemCode == "" || !this.isCheckItemCode) {
this.showErrorMessage("请输入零件", "itemCode")
return
}
if (this.qty == 0) {
this.showErrorMessage("数量必须大于0")
return
}
this.callback('add');
},
confirmSelect(e){
this.customerName = e[0].label
this.customerCode = e[0].value
},
checkItemCode() {
//
getBasicItemByCode(this.itemCode).then(res => {
uni.hideLoading();
if (res.data != null && res.data.list.length > 0) {
this.itemCode = res.data.list[0].code;
this.itemName = res.data.list[0].name
this.isCheckItemCode = true;
this.numberFocus = true
this.uom = res.data.list[0].uom
} else {
this.showErrorMessage('未查找到零件【' + this.itemCode + '】', "itemCode");
}
}).catch(error => {
uni.hideLoading();
this.showErrorMessage(error, "itemCode");
})
},
callback(action) {
let item = {
customerName :this.customerName,
customerCode:this.customerCode,
itemCode: this.itemCode,
itemName: this.itemName,
uom: this.uom,
qty: this.qty
};
this.closeRequestPopup();
this.$emit("confirm", action, item);
},
showErrorMessage(message, type) {
setTimeout(r => {
this.$refs.comMessage.showErrorMessage(message, res => {
if (type == "itemCode") {
this.itemCodeGetFocus();
} else {
this.numberFocus = true;
}
})
if (type == "itemCode") {
this.itemCode = ""
this.isCheckItemCode = false;
}
})
},
itemCodeConfirm() {
this.checkItemCode();
},
change(value) {
this.qty = value;
},
cancel(e) {
this.closeRequestPopup();
},
showSelect() {
if (this.editPosition) {
this.showCustomer = true
}
},
}
}
</script>
<style lang="scss">
.title {
font-size: 30rpx;
}
</style>

86
pages/deliver/record/deliverRecord.vue

@ -8,7 +8,7 @@
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<record-com-detail-card :dataContent="item" :index="index" :settingParam="jobContent"
<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
:isShowLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData"
@removePack="removePack">
</record-com-detail-card>
@ -32,6 +32,9 @@
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">
<view class="">
<requiredLocation v-if="showToLoaction" ref='comScanLocation' title="目标库位" :locationCode="toLocationCode"
@getLocation='scanLocationCode' :isShowEdit="true"
:locationTypeList="tolocationTypeList"></requiredLocation>
</view>
<view class=" uni-flex uni-row">
<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
@ -101,27 +104,23 @@
received: false,
isShowPackingCode: true,
scanCount: 0,
jobContent: {}, //
subList: [], //subList
detailSource: [], //
locationTypeList: [],
toLocationInfo: {},
businessTypeInfo: {},
fromLocationInfo: {},
fromLocationCode: "",
toLocationInfo: {},
toLocationCode: "",
isShowLocation: false,
fromlocationTypeList: [],
tolocationTypeList: [],
allowModifyLocation: false,
inInventoryStatus: "", //
outInventoryStatus: "", //
businessType: {},
customerList: [],
customer: "",
fromType: "",
showToLoaction: true
showToLoaction: true,
dataContent:{}
};
},
onLoad(option) {
@ -168,8 +167,10 @@
methods: {
updateTitle() {
if (this.fromType == "requestType") {
this.showToLoaction = false
updateTitle("制品发货申请")
} else {
this.showToLoaction = true
updateTitle("制品发货记录")
}
},
@ -179,14 +180,18 @@
let balance = result.balance;
let label = result.label;
let pack = result.package;
let labelQty =result.label.qty;
let balanceQty =result.balance.qty;
var item = this.detailSource.find(res => {
if (res.itemCode == balance.itemCode) {
return res
}
})
var qty =labelQty>balanceQty?balanceQty:labelQty
if (item == undefined) {
var itemp = createItemInfo(balance, pack);
var itemp = createItemInfo(qty, pack);
let newDetail = createDetailInfo(balance, pack); //
if(labelQty)
itemp.subList.push(newDetail);
this.detailSource.push(itemp)
} else {
@ -246,6 +251,17 @@
}
this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
},
scanLocationCode(location, code) {
this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
this.toLocationCode = code
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
detail.toLocationCode = code
})
})
})
},
showFromLocationPopup() {
this.$nextTick(() => {
this.$refs.scanLocationCode.openScanPopup();
@ -278,19 +294,19 @@
return;
}
console.log("客户", this.customer)
if (this.toLocationCode == "") {
if (this.toLocationCode == ""&&this.showToLoaction) {
this.showMessage("请先选择目标库位")
return;
}
//
uni.showLoading({
title: "提交中....",
mask: true
});
var params = this.setParams();
console.log("提交" + JSON.stringify(params))
if (this.fromType == "requestType") {
var params = this.setRequestParams();
console.log("提交" + JSON.stringify(params))
// deliverRequestSubmit(params).then(res => {
// uni.hideLoading()
// if (res.data) {
@ -325,8 +341,6 @@
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
// var subItem = {};
// Object.assign(subItem, detail)
detail.toPackingNumber = detail.packingNumber;
detail.toContainerNumber = detail.containerNumber
detail.toBatch = detail.toBatch;
@ -337,9 +351,47 @@
}
})
})
this.jobContent.subList = subList
this.jobContent.creator = creator;
return this.jobContent;
this.dataContent.subList = subList
this.dataContent.creator = creator;
return this.dataContent;
},
setRequestParams(){
var subList = []
var supplierCode=""
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
detail.soNumber =detail.package.soNumber;
detail.soLine = detail.soLine.soNumber;
// soNumber: 926926926,
// soLine: 926,
// itemCode: THILDD0A691AG,
// remark: ,
// qty: 2,
// uom: EA
subList.push(detail)
}
})
})
this.dataContent.subList = subList
this.dataContent.deliverPlanNumber = "DP20231130-0001"
this.dataContent.customerCode = "CF"
this.dataContent.customerDockCode = ""
this.dataContent.carrierCode = ""
this.dataContent.transferMode = ""
this.dataContent.vehiclePlateNumber = ""
this.dataContent.remark = ""
this.dataContent.dueTime = ""
this.dataContent.departmentCode = "研发部门"
this.dataContent.status = 1
this.dataContent.autoCommit = "FALSE"
this.dataContent.autoAgree = "FALSE"
this.dataContent.autoExecute = "FALSE"
this.dataContent.directCreateRecord = "FALSE"
return this.dataContent;
},
showMessage(message) {

2
pages/deliver/request/deliverRequest.vue

@ -193,7 +193,7 @@
openScanDetailPopup() {
uni.navigateTo({
url: "../record/deliverRecord?fromType=" + this.fromType
url: "./deliverRequestCreate"
})
},

222
pages/deliver/request/deliverRequestCreate.vue

@ -0,0 +1,222 @@
<template>
<view class="page-wraper">
<view class="" v-if='detailSource.subList.length==0'>
<com-blank-view @goScan='goScan(true)'></com-blank-view>
</view>
<view v-else class="page-wraper">
<view class="page-main">
<comDeliverRequestCreator ref="deliverRequest" :dataContent="detailSource">
</comDeliverRequestCreator>
<button class="btn_add" @click="goScan(false)">+去添加</button>
</view>
<div class="btn_bottom">
<view class="" style="display: flex;flex-direction: row;">
<view class="">
<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
</view>
</view>
</div>
<comMessage ref="comMessage"></comMessage>
</view>
</view>
<comDeliverRequestPopup ref="comDeliverRequestPopup" @confirm='requestConfirm'></comDeliverRequestPopup>
</template>
<script>
import {
deliverRequestSubmit,
issueRecordSubmit
} from '@/api/request2.js';
import {
goHome,
updateTitle,
getRemoveOption,
getISODateTime
} from '@/common/basic.js';
import {
getDataSource
} from '@/pages/issue/js/issue.js';
import comBlankView from '@/mycomponents/common/comBlankView.vue'
import comDeliverRequestPopup from '@/pages/deliver/coms/comDeliverRequestPopup.vue'
import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
import comDeliverRequestCreator from '@/pages/deliver/coms/comDeliverRequestCreator.vue'
export default {
name: 'issueRequestSubmit',
components: {
comBlankView,
comDeliverRequestPopup,
jobDetailPopup,
comMessage,
comDeliverRequestCreator
},
data() {
return {
subList: [], //subList
detailSource: {
subList: []
}, //
detailOptions: [],
scanOptions: [],
fromType: "",
dataContent:{}
}
},
mounted() {
this.goScan(true)
},
onLoad(option) {
this.fromType = option.fromType
},
methods: {
goScan(editPosition) {
this.$refs.comDeliverRequestPopup.openRequestPopup(editPosition);
},
//
requestConfirm(action, item) {
if (this.detailSource.subList.length == 0) {
this.detailSource = {
customerCode: item.customerCode,
customerName: item.customerName,
totalQty: 0,
subList: []
}
var subItem = {
itemCode: item.itemCode,
itemName: item.itemName,
qty: item.qty,
uom: item.uom
}
this.detailSource.subList.push(subItem)
} else {
var result = this.detailSource.subList.filter(res => {
if (res.itemCode == item.itemCode &&
res.productionLineCode == item.productionLineCode &&
res.workStationCode == item.workStationCode) {
return res
}
})
//
if (result.length == 0) {
var subItem = {
productionLineCode: item.productionLineCode,
productionLineName: item.productionLineName,
workStationCode: item.workStationCode,
workStationName: item.workStationName, //
itemCode: item.itemCode,
itemName: item.itemName,
qty: item.qty,
uom: item.uom
}
this.detailSource.subList.push(subItem)
} else {
//
result[0].qty += item.qty
}
}
this.caclcQty();
if (this.$refs.deliverRequest != undefined) {
this.$refs.deliverRequest.update()
}
},
caclcQty() {
var totalQty = 0;
this.detailSource.subList.forEach(res => {
totalQty += res.qty
})
this.detailSource.totalQty = totalQty;
},
setParams() {
return this.detailSource
},
submit() {
uni.showLoading({
title: "提交中....",
mask: true
});
var params = this.setRequestParams()
console.log("提交参数", JSON.stringify(params));
// deliverRequestSubmit(params).then(res => {
// uni.hideLoading()
// if (res.data) {
// this.showCommitSuccessMessage("<br>" + res.data)
// } else {
// this.showErrorMessage("[" + res.msg + "]")
// }
// }).catch(error => {
// uni.hideLoading()
// this.showErrorMessage(error)
// })
},
setRequestParams(){
var subList = []
this.detailSource.subList.forEach(detail => {
debugger
detail.soNumber = detail.package.soNumber;
detail.soLine = detail.package.soLine;
detail.remark =""
// soNumber: 926926926,
// soLine: 926,
// itemCode: THILDD0A691AG,
// remark: ,
// qty: 2,
// uom: EA
subList.push(detail)
})
this.detailSource.subList = subList
this.detailSource.deliverPlanNumber = "DP20231130-0001"
this.detailSource.customerCode = this.detailSource.customerCode
this.detailSource.customerDockCode = ""
this.detailSource.carrierCode = ""
this.detailSource.transferMode = ""
this.detailSource.vehiclePlateNumber = ""
this.detailSource.remark = ""
this.detailSource.dueTime = ""
this.detailSource.departmentCode = "研发部门"
this.detailSource.status = 1
this.detailSource.autoCommit = "FALSE"
this.detailSource.autoAgree = "FALSE"
this.detailSource.autoExecute = "FALSE"
this.detailSource.directCreateRecord = "FALSE"
return this.detailSource;
},
showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
uni.navigateTo({
url: './deliverRequest'
})
})
},
showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {}
});
},
}
}
</script>
<style>
</style>

3
pages/purchaseReturn/record/returnRecord.vue

@ -321,6 +321,9 @@
})
this.dataContent.subList = subList
this.dataContent.purchaseReceiptRecordNumber="";
this.transferMode ="";
this.dataContent.supplierCode = supplierCode
this.dataContent.businessType = "PurchasePutaway"
this.dataContent.departmentCode= "研发部门";

3
static/config.json

@ -18,8 +18,9 @@
"request_url": {
"name": "request_url",
"value": "http://dev.ccwin-in.com:25100/api/admin-api",
"value": "http://192.168.0.178:12080/admin-api",
"dev2":"http://192.168.0.157:12080/admin-api",
"chefang":"http://192.168.0.178:12080/admin-api",
"dev":"http://dev.ccwin-in.com:25100/api/admin-api",
"local":"http://localhost:12080",
"desc": "api请求地址"

Loading…
Cancel
Save