销售问题

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java

@@ -225,6 +225,14 @@ public class SaleorderitemController {
                 QueryWrapper<Arinvoices_item1Entity> queryWrapper4 = new QueryWrapper<>();
                 queryWrapper4.lambda().eq(Arinvoices_item1Entity::getArinvoicesId,arinvoicesEntity.getId());
                 List<Arinvoices_item1Entity> list1 = arinvoices_item1Service.list(queryWrapper4);
+                BigDecimal amount = new BigDecimal(0);
+                BigDecimal quantity = new BigDecimal(0);
+                for (Arinvoices_item1Entity entity : list1){
+                    amount = amount.add(entity.getAmount());
+                    quantity = quantity.add(entity.getQuantity());
+                }
+                arinvoicesEntity.setAmount(amount);
+                arinvoicesEntity.setQuantity(quantity);
                 arinvoicesEntity.setList0(list0);
                 arinvoicesEntity.setList1(list1);
                 return ActionResult.success(arinvoicesEntity);
@@ -707,7 +715,7 @@ public class SaleorderitemController {
 		for(Salesorder_item0Model jg_salesorder_item0Model : jg_salesorder_item0ModelList){
 								Map<String,Object> vehicleIdMap = new HashMap<>();
                 jg_salesorder_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",jg_salesorder_item0Model.getVehicleId(),vehicleIdMap));
-								Map<String,Object> materialIdMap = new HashMap<>();
+ 								Map<String,Object> materialIdMap = new HashMap<>();
                 jg_salesorder_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",jg_salesorder_item0Model.getMaterialId(),materialIdMap));
     }
 		vo.setSalesorder_item0List(jg_salesorder_item0ModelList);

SC-web/src/views/scm/basicInformation/saleorder/Form.vue

@@ -979,6 +979,7 @@
               url: '/api/saleorder/Saleorderitem/' + this.dataForm.id,
               method: 'get'
             }).then(res => {
+              debugger
               this.dataInfo(res.data)
               this.loading = false
             });
@@ -1166,22 +1167,22 @@
         for (let i = 0; i < _dataAll.salesorder_item0List.length; i++) {
           var _list = _dataAll.salesorder_item0List[i];
         }
-        for (let i = 0; i < _dataAll.receiptoutsoitemList.length; i++) {
+        // for (let i = 0; i < _dataAll.receiptoutsoitemList.length; i++) {
-          var _list = _dataAll.receiptoutsoitemList[i];
+        //   var _list = _dataAll.receiptoutsoitemList[i];
-        }
+        // }
-        for (let i = 0; i < _dataAll.arinvoices_item0soitemList.length; i++) {
+        // for (let i = 0; i < _dataAll.arinvoices_item0soitemList.length; i++) {
-          var _list = _dataAll.arinvoices_item0soitemList[i];
+        //   var _list = _dataAll.arinvoices_item0soitemList[i];
-          _list.attachMent = JSON.parse(_list.attachMent)
+        //   _list.attachMent = JSON.parse(_list.attachMent)
-        }
+        // }
-        for (let i = 0; i < _dataAll.collectionsoitemList.length; i++) {
+        // for (let i = 0; i < _dataAll.collectionsoitemList.length; i++) {
-          var _list = _dataAll.collectionsoitemList[i];
+        //   var _list = _dataAll.collectionsoitemList[i];
-        }
+        // }
-        for (let i = 0; i < _dataAll.salesbacksoitemList.length; i++) {
+        // for (let i = 0; i < _dataAll.salesbacksoitemList.length; i++) {
-          var _list = _dataAll.salesbacksoitemList[i];
+        //   var _list = _dataAll.salesbacksoitemList[i];
-        }
+        // }
-        for (let i = 0; i < _dataAll.paymentsoitemList.length; i++) {
+        // for (let i = 0; i < _dataAll.paymentsoitemList.length; i++) {
-          var _list = _dataAll.paymentsoitemList[i];
+        //   var _list = _dataAll.paymentsoitemList[i];
-        }
+        // }
         this.dataForm = _dataAll
       },
     },

SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue

@@ -661,9 +661,7 @@
                     }
                     for(let i=0;i<_dataAll.arinvoices_item0List.length;i++){
                         var _list = _dataAll.arinvoices_item0List[i];
-                        debugger
                       _list.attachMent = JSON.parse(_list.attachMent)
-                      debugger
                     }
                 this.dataForm = _dataAll
             },

SC-web/src/views/scm/basicInformation/saleorder/index.vue

@@ -58,8 +58,8 @@
             </el-button>
             <el-button type="text" icon="el-icon-delete" @click="invoicesEntry()">发票录入
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="collection()">回款
+<!--            <el-button type="text" icon="el-icon-delete" @click="collection()">回款
-            </el-button>
+            </el-button> -->
             <el-button type="text" icon="el-icon-check" @click="archive()">归档
             </el-button>
             <el-button type="text" icon="el-icon-check" @click="materialBack()">退货