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

src/manifest.json

@@ -74,6 +74,14 @@
                         "parameters" : {}
                     }
                 }
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "src/static/logo/72x72.png",
+                    "xhdpi" : "src/static/logo/96x96.png",
+                    "xxhdpi" : "src/static/logo/144x144.png",
+                    "xxxhdpi" : "src/static/logo/196x196.png"
+                }
             }
         },
         "nativePlugins" : {

src/pages/deliver/job/deliverDetail.vue

@@ -248,7 +248,9 @@
 				console.log("提交参数", JSON.stringify(params));
 
 				if(params.subList.length==0){
-					this.$refs.comMessage.showSuccessMessage('请扫描箱码')
+					uni.hideLoading()
+					this.$refs.comMessage.showConfirmMessageModal('请扫描箱码')
+					return
 				}
 				deliverJobSubmit(params).then(res => {
 					uni.hideLoading()

src/pages/package/record/overPackageRecord.vue

@@ -101,6 +101,9 @@
 	import packageTarget from '@/mycomponents/package/packageTarget.vue'
 	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
 	import packUnit from '@/mycomponents/qty/packUnit.vue'
+	import {
+		getCurrDateTime
+	} from '@/common/basic.js';
 
 	export default {
 		components: {
@@ -303,7 +306,7 @@
 			},
 			commit() {
 				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
-					if (this.toPackUnit == "包装规格") {
+					if (!this.toPackUnit||this.toPackUnit == "包装规格") {
 						this.showErrorMessage("请选择目标包装规格")
 						return;
 					}
@@ -349,13 +352,13 @@
 								itemName: item.itemName, // 物品名称
 								packName: item.packName,// 包装名称
 								packageCode: item.toPackingNumber, // 包装号
-								batch:item.batch,//批次
+								batch:item.toBatch,//批次
 								parentNumber:item.parentNumber,//父包装号
 								itemType: item.itemType,//物料类型
 								asnNumber:item.asnNumber,//ASN
 								supplierCode: item.supplierCode, // 供应商
 								qty: item.qty, // 数量
-								printTimes:item.printTimes, // 打印时间
+								printTimes:getCurrDateTime(), // 打印时间
 								barcodeString: item.barcodeString, // 标签信息
 								barcodeBase64: '',
 							})

src/pages/productPutaway/job/productPutawayJob.vue

@@ -342,6 +342,11 @@
 							column: "itemCode",
 							action: "==",
 							value: result.label.itemCode
+						},
+						{
+							column: "type",
+							action: "==",
+							value: this.type
 						},
 						// {
 						// 	column: "fromLocationCode",

src/pages/repleinsh/coms/comScanReplishPack.vue

@@ -567,15 +567,17 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
 							let item = this.toLocation.Items.find(r => r.itemCode == record.itemCode);
 							if (item != undefined) {
 								item.Locations.forEach(l => {
-									let batch = l.Batchs.find(b => b.packingNumber == record.packingNumber && b
-										.batch == record.batch);
+									let batch = l.Batchs.find(b => (b.packingNumber == record.packingNumber || b
+											.packingNumber == null || b.packingNumber == '') && b.batch ==
+										record.batch);
+										
 									let rIndex = batch.Records.findIndex(r => r.packingNumber == record
 										.packingNumber && r
 										.batch == record.batch);
 									batch.Records.splice(rIndex, 1);
 								})
 							}
-							this.$emit('updateData', item);
+							this.$emit('updateData', record);
 						}
 					});
 			},