Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

src/views/logisticsManagement/components/addPackingDialog.vue

@@ -91,7 +91,7 @@ export default {
   methods: {
     // 扫描箱条码
     changeCode() {
-      getQuantityLocation({ boxBarcode: this.form.boxBarcode }).then(res => {
+      getQuantityLocation({ boxBarcode: this.form.boxBarcode,isDetail:false }).then(res => {
         this.formLoading = true;
         this.boxBarInfo = res.data.data;
         if(res.data.data.yieldOrderList!= null ){

src/views/logisticsManagement/components/materialDetails.vue

@@ -133,7 +133,7 @@ export default {
   },
   methods: {
     init() {
-      getQuantityLocation({ boxBarcode: this.rowData.boxBarcode }).then(res => {
+      getQuantityLocation({ boxBarcode: this.rowData.boxBarcode,isDetail:true }).then(res => {
         let data_= res.data.data;
         
         this.data = data_.yieldOrderList.filter(item=>item.cardNo==this.rowData.cardNo)