Merge remote-tracking branch 'origin/master_hella' into master_hella

src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts

@@ -36,6 +36,17 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+    isForm: false,
+    isTable:true,
+  },
   {
     label: '车间代码',
     field: 'workShopCode',

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts

@@ -36,6 +36,17 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '生产计划单号',
+    field: 'productionPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+    isForm: false,
+    isTable:true,
+  },
   {
     label: '车间代码',
     field: 'workshopCode',

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue

@@ -235,10 +235,11 @@ const expandChange = (row: any, expandedRows: any[]) => {
     row.manTuoQty = Math.floor(parseFloat(row.manXiangQty) / parseFloat(row.otherNumber))
     // 放满的托数量*一托的箱数量*一箱的数量  获取放满的托一共多少数量
     let num1 = accuracyFun.multiply(parseFloat(row.manTuoQty ),parseFloat(row.otherNumber))
-    row.tuoInManNumber =accuracyFun.multiply(num1,parseFloat(row.packQty))
+    row.tuoInManNumber = accuracyFun.multiply(num1, parseFloat(row.packQty))
+    console.log(11,row.tuoInManNumber )
     // 数量除以托数量获取余数
     row.lastNumber =
-      parseFloat(row.qty) > parseFloat(row.tuoInManNumber)
+      parseFloat(row.qty) >= parseFloat(row.tuoInManNumber)
         ? accuracyFun.subtract( parseFloat(row.qty),parseFloat(row.tuoInManNumber)) 
         : parseFloat(row.qty)
     // 循环托

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue

@@ -109,7 +109,11 @@ const openFormByCreate = async ( data ) => {
     let beginTime =  data['endTime']
     if(data['deliveryDate']){
       let deliveryDate =  formatDate(data['deliveryDate'],'YYYY-MM-DD')
+      if(beginTime){
         planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00"
+      }else{
+        planArriveTimeStr.value = deliveryDate + ' '+ "00:00:00"
+      }
       setV['planArriveTime']= new Date(planArriveTimeStr.value).valueOf();
       setV['arriveTime']= new Date(planArriveTimeStr.value).valueOf();
     }