zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

拆分标签功能页面开发，所有的箱标签（包装数量+数量）字段调整

dev_web_online
安虹睿 2 years ago
parent
43de60c1fb
commit
d7a9125e72
5 changed files with 243 additions and 122 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      fe/PC/src/api/wms-api.js
  2. 9
      fe/PC/src/api/wms-core.js
  3. 10
      fe/PC/src/mixins/printMixin.js
  4. 30
      fe/PC/src/router/index.js
  5. 307
      fe/PC/src/views/labelManage/PartiallyPreparedProducts/splitLabels.vue

9
fe/PC/src/api/wms-api.js
View File

@ -417,6 +417,15 @@ export function notifyMessage(params, id) {
// }) // })
// } // }
// 库存列表
export function inventoryBalanceList(data) {
return request({
url: baseURL + 'wms/inventory/Inventory-Balance/list',
method: 'post',
data
})
}
// 库存-启用 | 库存余额 改 // 库存-启用 | 库存余额 改
export function inventoryBalanceActive(params) { export function inventoryBalanceActive(params) {
return request({ return request({

9
fe/PC/src/api/wms-core.js
View File

@ -35,4 +35,13 @@ export function postInventoryLabelCode_count(params,data) {
method: 'post', method: 'post',
data data
}) })
}
// 拆箱 | 标签管理-拆分箱标签
export function postSplitPacking(data) {
return request({
url: baseURL + 'wms/store/transfer-note/split-packing',
method: 'post',
data
})
} }

10
fe/PC/src/mixins/printMixin.js
View File

@ -42,7 +42,7 @@ export function initPrintPackingCodeData(propsData,options,name,url){
"packingCode": item[_options.packingCode] || item.packingCode,//条形码 "packingCode": item[_options.packingCode] || item.packingCode,//条形码
"printIndex":item[_options.printIndex] || Number(key)+1,//打印序列 "printIndex":item[_options.printIndex] || Number(key)+1,//打印序列
// "itemName": item[_options.itemName] || item.itemName,//物品名称 暂未使用 // "itemName": item[_options.itemName] || item.itemName,//物品名称 暂未使用
// "stdPackQty": item[_options.stdPackQty] || item.stdPackQty,//整包数量 暂未使用 "stdPackQty": item[_options.stdPackQty] || item.stdPackQty,//整包数量 暂未使用
} }
], ],
}) })
@ -85,7 +85,8 @@ export function initPrintPackingCodeTwoData(oldData,newData,options,name,url){
"oldLot": oldData[_options.lot] || oldData.lot,//上方_生产批次 "oldLot": oldData[_options.lot] || oldData.lot,//上方_生产批次
"oldLocationErpCode": oldData[_options.locationErpCode] || oldData.locationErpCode,//上方_储位 "oldLocationErpCode": oldData[_options.locationErpCode] || oldData.locationErpCode,//上方_储位
"oldItemCode": oldData[_options.itemCode] || oldData.itemCode,//上方_物品代码（ERP号） "oldItemCode": oldData[_options.itemCode] || oldData.itemCode,//上方_物品代码（ERP号）
"oldQty": oldData[_options.qty] || oldData.qty,//上方_要货数量 + 整包数量 "oldQty": oldData[_options.qty] || oldData.qty,//上方_要货数量
"oldStdPackQty": oldData[_options.stdPackQty] || oldData.stdPackQty,//上方_整包数量
"oldPackingCode": oldData[_options.packingCode] || oldData.packingCode,//上方_条形码 "oldPackingCode": oldData[_options.packingCode] || oldData.packingCode,//上方_条形码
"oldPrintIndex":oldData[_options.printIndex] || 1,//上方_打印序列 "oldPrintIndex":oldData[_options.printIndex] || 1,//上方_打印序列
..._printData ..._printData
@ -108,7 +109,8 @@ export function initPrintPackingCodeTwoData(oldData,newData,options,name,url){
"newLot": newData[_options.lot] || newData.lot,//下方_生产批次 "newLot": newData[_options.lot] || newData.lot,//下方_生产批次
"newLocationErpCode": newData[_options.locationErpCode] || newData.locationErpCode,//下方_储位 "newLocationErpCode": newData[_options.locationErpCode] || newData.locationErpCode,//下方_储位
"newItemCode": newData[_options.itemCode] || newData.itemCode,//下方_物品代码（ERP号） "newItemCode": newData[_options.itemCode] || newData.itemCode,//下方_物品代码（ERP号）
"newQty": newData[_options.qty] || newData.qty,//下方_要货数量 + 整包数量 "newQty": newData[_options.qty] || newData.qty,//下方_数量 + 整包数量
"newStdPackQty": newData[_options.stdPackQty] || newData.stdPackQty,//上方_整包数量
"newPackingCode": newData[_options.packingCode] || newData.packingCode,//下方_条形码 "newPackingCode": newData[_options.packingCode] || newData.packingCode,//下方_条形码
"newPrintIndex":newData[_options.printIndex] || 1,//下方_打印序列 "newPrintIndex":newData[_options.printIndex] || 1,//下方_打印序列
..._printData ..._printData
@ -177,7 +179,7 @@ export function initPrintPackingCodeTwoData(oldData,newData,options,name,url){
_label['lot'+Number(key2 + 1)] = item[_options.lot] || item2.lot;//生产批次 _label['lot'+Number(key2 + 1)] = item[_options.lot] || item2.lot;//生产批次
_label['locationErpCode'+Number(key2 + 1)] = item[_options.locationErpCode] || item2.locationErpCode;//储位 _label['locationErpCode'+Number(key2 + 1)] = item[_options.locationErpCode] || item2.locationErpCode;//储位
_label['itemCode'+Number(key2 + 1)] = item[_options.itemCode] || item2.itemCode;//物品代码（ERP号） _label['itemCode'+Number(key2 + 1)] = item[_options.itemCode] || item2.itemCode;//物品代码（ERP号）
// _label['stdPackQty'+Number(key2 + 1)] = item[_options.stdPackQty] || item2.stdPackQty;//整包数量 暂未使用 _label['stdPackQty'+Number(key2 + 1)] = item[_options.stdPackQty] || item2.stdPackQty;//整包数量 暂未使用
_label['qty'+Number(key2 + 1)] = item[_options.qty] || item2.qty;//要货数量 + 整包数量 _label['qty'+Number(key2 + 1)] = item[_options.qty] || item2.qty;//要货数量 + 整包数量
_label['packingCode'+Number(key2 + 1)] = item[_options.packingCode] || item2.packingCode;//条形码 _label['packingCode'+Number(key2 + 1)] = item[_options.packingCode] || item2.packingCode;//条形码
_label['printIndex'+Number(key2 + 1)] = item[_options.printIndex] || item2.printIndex;//序号 _label['printIndex'+Number(key2 + 1)] = item[_options.printIndex] || item2.printIndex;//序号

30
fe/PC/src/router/index.js
View File

@ -135,21 +135,21 @@ export const constantRoutes = [
}] }]
}, },
// 开发中模拟路由 // 开发中模拟路由
// { {
// path: '/', path: '/',
// component: Layout, component: Layout,
// redirect: '/splitLabels', redirect: '/splitLabels',
// hidden: true, hidden: true,
// children: [{ children: [{
// path: 'splitLabels', path: 'splitLabels',
// component: () => import('@/views/labelManage/PartiallyPreparedProducts/splitLabels.vue'), component: () => import('@/views/labelManage/PartiallyPreparedProducts/splitLabels.vue'),
// name: 'splitLabels', name: 'splitLabels',
// meta: { meta: {
// title: 'splitLabels', title: 'splitLabels',
// icon: '拆分箱标签', icon: '拆分箱标签',
// } }
// }] }]
// }, },
// { // {
// path: '/', // path: '/',
// component: Layout, // component: Layout,

307
fe/PC/src/views/labelManage/PartiallyPreparedProducts/splitLabels.vue
View File

@ -57,9 +57,9 @@
</div> </div>
</template> </template>
<script> <script>
import { getPageList } from "@/api/wms-api" import { inventoryBalanceList } from "@/api/wms-api"
import { initDataToHttpFormat } from "@/utils/index" import { initDataToHttpFormat } from "@/utils/index"
import { postInventoryLabelCode_count } from "@/api/wms-core" import { postInventoryLabelCode_count,postSplitPacking } from "@/api/wms-core"
import currenForm from "@/components/currenForm" import currenForm from "@/components/currenForm"
import StepsFormAlone from "@/components/StepsFormAlone" import StepsFormAlone from "@/components/StepsFormAlone"
import resultStatus from "@/components/resultStatus" import resultStatus from "@/components/resultStatus"
@ -69,8 +69,9 @@ import _ from "lodash"
import { mixins } from "@/mixins/mixins" import { mixins } from "@/mixins/mixins"
import { LoadingMixins } from "@/mixins/LoadingMixins" import { LoadingMixins } from "@/mixins/LoadingMixins"
import { filterSelectMixins } from '@/mixins/filter-Select' import { filterSelectMixins } from '@/mixins/filter-Select'
import store from '@/store'
export default { export default {
name: "RecycledMaterialsLabel", name: "splitLabels",
mixins: [ mixins: [
mixins, mixins,
LoadingMixins, LoadingMixins,
@ -82,12 +83,12 @@ export default {
currenTableFlex, currenTableFlex,
resultStatus, resultStatus,
}, },
watch:{ // watch:{
"selectData.labelType"(val){ // "selectData.labelType"(val){
console.log("watch",val) // console.log("watch",val)
this.changeFormItemShow(val) // this.changeFormItemShow(val)
} // }
}, // },
data () { data () {
let _this = this let _this = this
return { return {
@ -99,19 +100,20 @@ export default {
{title:"打印"}, {title:"打印"},
], ],
selectItemInfo:{},//已选物品信息 selectItemInfo:{},//已选物品信息
selectSupplierItemInfo:{},//已选供应商对应的物品信息 InventoryInfo:{},//库存表中，箱码相关信息
selectSupplierInfo:{},//已选供应商的信息 // selectSupplierItemInfo:{},//已选供应商对应的物品信息
selectPoNumberInfo:{},//已选采购订单号的信息 // selectSupplierInfo:{},//已选供应商的信息
// selectPoNumberInfo:{},//已选采购订单号的信息
// 默认筛选数据 // 默认筛选数据
defaultSelectData:{ defaultSelectData:{
oldPackingCode:"",//原箱标签 oldPackingCode:"",//原箱标签
itemCode:"",//物品代码 itemCode:"",//物品代码
itemName:"",//物品名称 itemName:"",//物品名称
canMake:null,//制造件 // canMake:null,//制造件
canBuy:null,//采购件 // canBuy:null,//采购件
labelType:null,//1采购标签 2生产标签 labelType:null,//1采购标签 2生产标签
isRecycled:null,//回收件 // isRecycled:null,//回收件
canOutsourcing:null,//外包件 // canOutsourcing:null,//外包件
qty:"", qty:"",
lot:"", lot:"",
labelQty:"1", labelQty:"1",
@ -120,31 +122,38 @@ export default {
remark:"", remark:"",
arriveDate:undefined, arriveDate:undefined,
produceDate:undefined, produceDate:undefined,
stdPackQty:0
}, },
// 筛选数据 // 筛选数据
selectData:{}, selectData:{},
// 筛选条件 // 筛选条件
selectForm:[ selectForm:[
{ {
type: "filterSelect", label: "原箱标签", prop: "oldPackingCode", optionsLabel: "itemCode", optionsValue: "packingCode", clearable:true, type: "filterSelect", label: "原箱标签", prop: "oldPackingCode", optionsLabel: "itemCode", optionsValue: "code", clearable:true,
focus: (type,val) => { return this.getFilterList(type, val, "wms/inventory/Inventory-Balance")}, focus: (type,val) => { return this.getFilterList(type, val, "label/inventory-label",[
searchButton: (val) => { this.showSerarchPage(val, 'wms/inventory/Inventory-Balance', 'InventoryBalance', '箱标签选择', this.selectData) }, {logic:"And",column:"labelType",action:"==",value:"1"},
{logic:"And",column:"qty",action:">",value:"0"},
])},
searchButton: (val) => { this.showSerarchPage(val, 'label/inventory-label', 'labelsList', '箱标签选择', this.selectData,[
{logic:"And",column:"labelType",action:"==",value:"1"},
{logic:"And",column:"qty",action:">",value:"0"},
]) },
colSpan: 12, colSpan: 12,
}, },
{ type: "inputNumber", label: "实际数量", prop: "qty",colSpan: 12 },
{ type: "input",disabled:true,label: "物品代码", prop: "itemCode", colSpan: 12 }, { type: "input",disabled:true,label: "物品代码", prop: "itemCode", colSpan: 12 },
{ type: "input",disabled:true,label: "物品名称", prop: "itemName", colSpan: 12 }, { type: "input",disabled:true,label: "物品名称", prop: "itemName", colSpan: 12 },
{ type: "select",disabled:true, label: "制造件", prop: "canMake", options: "whetherOrNot", colSpan: 12 }, { type: "input",disabled:true,label: "标包数量", prop: "stdPackQty", colSpan: 12 },
{ type: "select", disabled:true,label: "采购件", prop: "canBuy", options: "whetherOrNot", colSpan: 12 }, // { type: "select",disabled:true, label: "制造件", prop: "canMake", options: "whetherOrNot", colSpan: 12 },
// { type: "select", disabled:true,label: "采购件", prop: "canBuy", options: "whetherOrNot", colSpan: 12 },
{ type: "select", disabled:true,label: "标签类型", prop: "labelType", options: "labelTypeSelectOption", colSpan: 12 }, { type: "select", disabled:true,label: "标签类型", prop: "labelType", options: "labelTypeSelectOption", colSpan: 12 },
{ type: "select", disabled:true,label: "回收件", prop: "isRecycled", options: "whetherOrNot", colSpan: 12 }, // { type: "select", disabled:true,label: "回收件", prop: "isRecycled", options: "whetherOrNot", colSpan: 12 },
{ type: "select", disabled:true,label: "外包件", prop: "canOutsourcing", options: "whetherOrNot", colSpan: 12 }, // { type: "select", disabled:true,label: "外包件", prop: "canOutsourcing", options: "whetherOrNot", colSpan: 12 },
{ type: "inputNumber", label: "实际数量", prop: "qty",colSpan: 12 }, { type: "input", disabled:true, label: "批次", prop: "lot", colSpan: 12 },
{ type: "input", label: "批次", prop: "lot", colSpan: 12 },
// { type: "inputNumber", label: "标签个数", prop: "labelQty", min:1,colSpan: 12 }, // { type: "inputNumber", label: "标签个数", prop: "labelQty", min:1,colSpan: 12 },
{ type: "dateTime", label: "生产时间", prop: "produceDate", colSpan: 12 }, { type: "dateTime", disabled:true,label: "生产时间", prop: "produceDate", colSpan: 12 },
{ type: "dateTime", label: "到货时间", prop: "arriveDate", colSpan: 12 }, { type: "dateTime", disabled:true,label: "到货时间", prop: "arriveDate", colSpan: 12 },
{ type: "input", label: "备注", prop: "remark", colSpan: 12 }, { type: "input", disabled:true,label: "备注", prop: "remark", colSpan: 12 },
{ type: "input",disabled:true,label: "供应商代码", prop: "supplierCode", colSpan: 12 }, { type: "input",disabled:true,label: "供应商代码", prop: "supplierCode", colSpan: 12 },
{ type: "input",disabled:true,label: "采购订单号", prop: "poNumber", colSpan: 12 }, { type: "input",disabled:true,label: "采购订单号", prop: "poNumber", colSpan: 12 },
// { // {
@ -167,7 +176,7 @@ export default {
selectRules:{ selectRules:{
oldPackingCode: [{ required: true, trigger: "change", message: "请选择原箱标签" },], oldPackingCode: [{ required: true, trigger: "change", message: "请选择原箱标签" },],
// itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" },], // itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" },],
labelType:[{ required: true, trigger: "change", message: "标签类型不能为空" }], // labelType:[{ required: true, trigger: "change", message: "标签类型不能为空" }],
qty: [{ required: true, trigger: "change", message: "实际数量不能为空" }], qty: [{ required: true, trigger: "change", message: "实际数量不能为空" }],
// labelQty: [{ required: true, trigger: "change", message: "标签个数不能为空" }], // labelQty: [{ required: true, trigger: "change", message: "标签个数不能为空" }],
// supplierCode: [{ required: false, trigger: "change", message: "当前为采购标签，供应商代码为必填项" }], // supplierCode: [{ required: false, trigger: "change", message: "当前为采购标签，供应商代码为必填项" }],
@ -197,19 +206,13 @@ export default {
this.selectData = this.defaultSelectData this.selectData = this.defaultSelectData
}, },
methods: { methods: {
consoleLog(){
console.log('selectItemInfo',this.selectItemInfo)//basedata/item-basic/list
console.log('selectData',this.selectData)
console.log('selectSupplierItemInfo',this.selectSupplierItemInfo)//basedata/supplier-item/list
console.log('selectSupplierInfo',this.selectSupplierInfo)//basedata/supplier/{id}
console.log('selectPoNumberInfo',this.selectPoNumberInfo)
},
// 返回 // 返回
rest(){ rest(){
this.selectItemInfo={}; this.selectItemInfo={};
this.selectSupplierItemInfo = {} this.InventoryInfo={}
this.selectPoNumberInfo = {} // this.selectSupplierItemInfo = {}
this.selectSupplierInfo = {} // this.selectPoNumberInfo = {}
// this.selectSupplierInfo = {}
this.selectData = this.defaultSelectData this.selectData = this.defaultSelectData
this.flexSelectTableData = []; this.flexSelectTableData = [];
this.$refs.steps_split.returnFirstActive() this.$refs.steps_split.returnFirstActive()
@ -225,29 +228,67 @@ export default {
}, },
// 第一部物品代码点击拉取 // 第一部物品代码点击拉取
detailsDataPush (val) { detailsDataPush (val) {
// 点击原箱标签（todo:数据确定）
if(val[1].prop == "oldPackingCode"){ if(val[1].prop == "oldPackingCode"){
this.rest() this.rest()
this.selectItemInfo = val[0]; this.selectItemInfo = val[0];
this.selectSupplierItemInfo = val[0];//todo：供应商信息确认 this.selectItemInfo.packingCode = val[0].code;
this.selectPoNumberInfo = val[0];//todo：采购订单信息确认 this.selectData.oldPackingCode = this.selectItemInfo.code
this.selectData.oldPackingCode = this.selectItemInfo.packingCode
this.selectData.itemCode = this.selectItemInfo.itemCode this.selectData.itemCode = this.selectItemInfo.itemCode
this.selectData.itemName = this.selectItemInfo.itemName this.selectData.itemName = this.selectItemInfo.itemName
this.selectData.canBuy=this.selectItemInfo.canBuy; this.selectData.labelType = this.selectItemInfo.labelType
this.selectData.canMake=this.selectItemInfo.canMake; this.selectData.lot = this.selectItemInfo.lot
this.selectData.isRecycled=this.selectItemInfo.isRecycled; this.selectData.supplierCode = this.selectItemInfo.supplierCode
this.selectData.canOutsourcing=this.selectItemInfo.canOutsourcing; this.selectData.poNumber = this.selectItemInfo.poNumber
this.selectData.remark = this.selectItemInfo.remark
this.selectData.arriveDate = this.selectItemInfo.arriveDate
this.selectData.produceDate = this.selectItemInfo.produceDate
this.selectData.stdPackQty= this.selectItemInfo.stdPackQty
let _option = {
SkipCount: 0,
MaxResultCount: 100,
condition: {
filters: [
{
logic: "And",
column: "packingCode",
action: "Like",
value: val[0].code
}
]
}
}
inventoryBalanceList(_option)
.then(res => {
console.log(255,res)
this.InventoryInfo = res.items[0]
console.log(245,'item',this.selectItemInfo)
console.log(246,'库存',this.InventoryInfo)
this.pageLoading = false
})
.catch(err => {
this.pageLoading = false
})
// todo：InventoryInfo
// this.selectSupplierItemInfo = val[0];
// this.selectPoNumberInfo = val[0];
// this.selectData.itemCode = this.selectItemInfo.itemCode
// this.selectData.itemName = this.selectItemInfo.itemName
// this.selectData.canBuy=this.selectItemInfo.canBuy;
// this.selectData.canMake=this.selectItemInfo.canMake;
// this.selectData.isRecycled=this.selectItemInfo.isRecycled;
// this.selectData.canOutsourcing=this.selectItemInfo.canOutsourcing;
// 采购件、制造件只有一个为true 则自动生成比标签类型，并设置不可修改 // 采购件、制造件只有一个为true 则自动生成比标签类型，并设置不可修改
let _labelType_index = this.getFormPropIndex('labelType') // let _labelType_index = this.getFormPropIndex('labelType')
if((this.selectItemInfo.canBuy && !this.selectItemInfo.canMake) || (!this.selectItemInfo.canBuy && this.selectItemInfo.canMake)){ // if((this.selectItemInfo.canBuy && !this.selectItemInfo.canMake) || (!this.selectItemInfo.canBuy && this.selectItemInfo.canMake)){
this.selectData.labelType = this.selectItemInfo.canBuy ? 1 : 2; // this.selectData.labelType = this.selectItemInfo.canBuy ? 1 : 2;
this.selectForm[_labelType_index].disabled = true // this.selectForm[_labelType_index].disabled = true
}else{ // }else{
this.selectData.labelType = null // this.selectData.labelType = null
this.selectForm[_labelType_index].disabled = false // this.selectForm[_labelType_index].disabled = false
} // }
} }
// 点击供应商 // 点击供应商
// if(val[1].prop == "supplierCode"){ // if(val[1].prop == "supplierCode"){
@ -269,78 +310,136 @@ export default {
// } // }
}, },
// 更改表单显示数据 // 更改表单显示数据
changeFormItemShow(val){ // changeFormItemShow(val){
this.selectData.labelType = val // this.selectData.labelType = val
let _poNumber_index = this.getFormPropIndex('poNumber') // let _poNumber_index = this.getFormPropIndex('poNumber')
let _supplierCode_index = this.getFormPropIndex('supplierCode') // let _supplierCode_index = this.getFormPropIndex('supplierCode')
// 采购标签 // // 采购标签
if(this.selectData.labelType == 1){ // if(this.selectData.labelType == 1){
this.selectForm[_poNumber_index].hide = false // this.selectForm[_poNumber_index].hide = false
this.selectForm[_supplierCode_index].hide = false // this.selectForm[_supplierCode_index].hide = false
// this.selectRules.poNumber[0].required = true // // this.selectRules.poNumber[0].required = true
// this.selectRules.supplierCode[0].required = true // // this.selectRules.supplierCode[0].required = true
} // }
// 生产标签 // // 生产标签
else{ // else{
this.selectForm[_poNumber_index].hide = true // this.selectForm[_poNumber_index].hide = true
this.selectForm[_supplierCode_index].hide = true // this.selectForm[_supplierCode_index].hide = true
// this.selectRules.poNumber[0].required = false // // this.selectRules.poNumber[0].required = false
// this.selectRules.supplierCode[0].required = false // // this.selectRules.supplierCode[0].required = false
// }
// },
// 拆箱
postSplitPackingHandle(newCode,resolve,reject){
let _data = {
useOnTheWayLocation: false,
requestNumber: null,
worker: store.getters.name.userName,
jobNumber: null,
remark: this.selectItemInfo.remark,
extraProperties: this.selectItemInfo.extraProperties,
activeDate: new Date(),
confirmed: true,
confirmTime: new Date(),
details: [{
fromLocationCode: this.InventoryInfo ? this.InventoryInfo.locationCode : null,
fromLocationErpCode: this.selectItemInfo.locationErpCode || (this.InventoryInfo ? this.InventoryInfo.locationErpCode : null),
fromLot: this.selectItemInfo.lot,
fromPackingCode: this.selectItemInfo.code,
fromWarehouseCode: this.InventoryInfo ? this.InventoryInfo.warehouseCode : null,
itemCode: this.selectItemInfo.itemCode,
itemName: this.selectItemInfo.itemName,
toLocationCode: this.InventoryInfo ? this.InventoryInfo.locationCode : null,
toLocationErpCode: this.selectItemInfo.locationErpCode || (this.InventoryInfo ? this.InventoryInfo.locationErpCode : null),
toLot: this.selectItemInfo.lot,
toPackingCode: newCode,
toWarehouseCode: this.InventoryInfo ? this.InventoryInfo.warehouseCode : "T8",//没有值特殊处理？
uom: this.selectItemInfo.uom,
itemDesc1: this.selectItemInfo.itemDesc1,
onTheWayLocationCode: "",
expireDate: this.selectItemInfo.expireDate,
fromLocationArea: this.InventoryInfo ? this.InventoryInfo.locationArea : null,
itemDesc2: this.selectItemInfo.itemDesc2,
fromLocationGroup: this.InventoryInfo ? this.InventoryInfo.locationGroup : null,
toLocationArea: this.InventoryInfo ? this.InventoryInfo.locationArea : null,
reason: "",
fromStatus: this.InventoryInfo ? this.InventoryInfo.status : 0,//没有值特殊处理？
stdPackQty: this.selectItemInfo.stdPackQty || 0,//没有值特殊处理？
arriveDate: this.selectItemInfo.arriveDate,
toContainerCode: this.selectItemInfo.containerCode,
produceDate: this.selectItemInfo.produceDate,
supplierBatch: this.selectItemInfo.supplierBatch,
toStatus: this.InventoryInfo ? this.InventoryInfo.status : 0,//没有值特殊处理？
toLocationGroup: this.InventoryInfo ? this.InventoryInfo.locationGroup : null,
qty: Number(this.selectData.qty),
remark: this.selectItemInfo.remark,
fromContainerCode: this.selectItemInfo.containerCode,
}],
type: "SplitPacking"
} }
// 拆分
postSplitPacking(_data)
.then(res => {
this.pageLoading = false
resolve()
})
.catch(err => {
this.pageLoading = false
reject()
})
}, },
// 第一步骤下一步操作 // 第一步骤下一步操作
firstNext(){ firstNext(){
return new Promise((resolve,reject) => { return new Promise((resolve,reject) => {
this.$refs['form_split'].getDom().validate(valid=>{ this.$refs['form_split'].getDom().validate(valid=>{
if(valid){ if(valid){
// this.consoleLog()
let _data = { let _data = {
// fullBarcodeString: undefined,//获取不到 // fullBarcodeString: undefined,//获取不到
itemCode: this.selectData.itemCode || null, itemCode: this.selectItemInfo.itemCode || null,
itemName: this.selectItemInfo.itemName || null, itemName: this.selectItemInfo.itemName || null,
itemDesc1: this.selectItemInfo.itemDesc1 || null, itemDesc1: this.selectItemInfo.itemDesc1 || null,
itemDesc2: this.selectItemInfo.itemDesc2 || null, itemDesc2: this.selectItemInfo.itemDesc2 || null,
lot: this.selectData.lot || "", lot: this.selectItemInfo.lot || "",
// supplierBatch: undefined,//获取不到 supplierBatch: this.selectItemInfo.supplierBatch,
arriveDate: initDataToHttpFormat(this.selectData.arriveDate), arriveDate: this.selectItemInfo.arriveDate,
produceDate: initDataToHttpFormat(this.selectData.produceDate), produceDate: this.selectItemInfo.produceDate,
// expireDate: undefined,//获取不到 expireDate: this.selectItemInfo.expireDate,
stdPackQty: Number(this.selectItemInfo.stdPackQty) || 0, stdPackQty: Number(this.selectItemInfo.stdPackQty) || 0,
uom: this.selectItemInfo.basicUom || "", uom: this.selectItemInfo.uom || "",
qty: Number(this.selectData.qty), qty: Number(this.selectData.qty),
labelStatus: 1,//标签状态 labelStatus: 1,//标签状态
// recommendLocationCode: undefined,//获取不到 recommendLocationCode: this.selectItemInfo.recommendLocationCode,
// locationErpCode: undefined,//获取不到 locationErpCode: this.selectItemInfo.locationErpCode,
// containerCode: undefined,//获取不到 containerCode: this.selectItemInfo.containerCode,
supplierCode: this.selectData.supplierCode, supplierCode: this.selectItemInfo.supplierCode,
poNumber: this.selectData.poNumber, poNumber: this.selectItemInfo.poNumber,
rpNumber: this.selectPoNumberInfo.rpNumber, rpNumber: this.selectItemInfo.rpNumber,
asnNumber: this.selectPoNumberInfo.number, asnNumber: this.selectItemInfo.number,
// qLevel: this.selectItemInfo.qLevel || undefined,//获取不到 qLevel: this.selectItemInfo.qLevel,
// qualityFile: undefined,//获取不到 qualityFile: this.selectItemInfo.qualityFile,
// prodLine: undefined,//获取不到 prodLine: this.selectItemInfo.prodLine,
// team: undefined,//获取不到 team: this.selectItemInfo.team,
// shift: undefined,//获取不到 shift: this.selectItemInfo.shift,
specifications: this.selectItemInfo.color || null, specifications: this.selectItemInfo.specifications,
supplierName: this.selectSupplierItemInfo.supplierName, supplierName: this.selectItemInfo.supplierName,
supplierSimpleName: this.selectSupplierItemInfo.supplierSimpleName, supplierSimpleName: this.selectItemInfo.supplierSimpleName,
supplierItemCode: this.selectSupplierItemInfo.supplierItemCode, supplierItemCode: this.selectItemInfo.supplierItemCode,
supplierItemName: this.selectSupplierItemInfo.itemName, supplierItemName: this.selectItemInfo.supplierItemName,
labelType: this.selectData.labelType, labelType: this.selectItemInfo.labelType,
planArriveDate: initDataToHttpFormat(this.selectPoNumberInfo.planArriveDate), planArriveDate: this.selectItemInfo.planArriveDate,
remark:this.selectData.remark,//接口缺少 remark:this.selectItemInfo.remark,
} }
// 生成标签（接口） // 生成标签（接口）
this.pageLoading = true; this.pageLoading = true;
postInventoryLabelCode_count({count:this.selectData.labelQty}, _data) postInventoryLabelCode_count({count:this.selectData.labelQty}, _data)
.then(res => { .then(res => {
this.pageLoading = false // this.pageLoading = false
this.flexSelectTableData = res this.flexSelectTableData = res
this.flexSelectTableData.forEach(item=>{ this.flexSelectTableData.forEach(item=>{
item.packingCode=item.code item.packingCode=item.code
}) })
this.flexSelectTableData[0].oldPackingCode = this.selectData.oldPackingCode this.flexSelectTableData[0].oldPackingCode = this.selectData.oldPackingCode
resolve() this.postSplitPackingHandle(res[0].code,resolve,reject)
}) })
.catch(err => { .catch(err => {
this.pageLoading = false this.pageLoading = false
@ -359,9 +458,11 @@ export default {
// 打印 // 打印
printHandle(){ printHandle(){
let _oldData = this.selectItemInfo let _oldData = this.selectItemInfo
_oldData.packingCode = this.selectItemInfo.code
let _newData = this.flexSelectTableData[0] let _newData = this.flexSelectTableData[0]
_oldData.title = "原箱标签" _oldData.title = "原箱标签"
_newData.title = "拆分箱标签" _newData.title = "拆分箱标签"
console.log(_oldData,_newData)
this.Print(initPrintPackingCodeTwoData(_oldData,_newData)) this.Print(initPrintPackingCodeTwoData(_oldData,_newData))
}, },
//过滤查询条件 //过滤查询条件

Write Preview
Loading…
Cancel
Save