问题修改

SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistPagination.java

@@ -43,6 +43,9 @@ public class PoundlistPagination extends Pagination {
     private List<String> poundlistIds;
     private String businessId;
 
+    private String purchaseStatus;
+    private String salesStatus;
+
     /**
      * 添加权限
      */

SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java

@@ -81,7 +81,7 @@ public class SalebackEntity  {
     private String remark;
 
     @TableField("ACTUAL_AMOUNT")
-    private String actualAmount;
+    private BigDecimal actualAmount;
 
     @TableField("STATUS")
     private String status;

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

@@ -545,14 +545,17 @@ public class SaleorderitemController {
                 salesorder_item0Service.save(entitys);
             }
             if (StringUtils.isNotEmpty(saleorderitemCrForm.getIsTransfer()) && saleorderitemCrForm.getIsTransfer().equals("1")){
-                if (StringUtils.isNotEmpty(saleorderitemCrForm.getPurchaseOrderId())){
-                    PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getById(saleorderitemCrForm.getPurchaseOrderId());
+                String[] purchaseIdList = saleorderitemCrForm.getPurchaseOrderId().split(",");
+                for (String purchaseId : purchaseIdList) {
+                    if (StringUtils.isNotEmpty(purchaseId)) {
+                        PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getById(purchaseId);
                         if (ObjectUtils.isNotEmpty(purchaseorderitemEntity)) {
                             purchaseorderitemEntity.setIsTransfer("1");
                             purchaseorderitemService.updateById(purchaseorderitemEntity);
                         }
                     }
                 }
+            }
         return ActionResult.success("创建成功");
 }
 

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbacksoitemEntity.java

@@ -81,7 +81,7 @@ public class SalesbacksoitemEntity  {
     private String remark;
 
     @TableField("ACTUAL_AMOUNT")
-    private String actualAmount;
+    private BigDecimal actualAmount;
 
     @TableField("STATUS")
     private String status;

SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml

@@ -74,10 +74,10 @@ WHERE a.delete_mark = 0 and
             AND (b.ticketno LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR c.supplier_name LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR d.supplier_nm LIKE CONCAT('%',#{poundlistPagination.keyword},'%'))
         </if>
 		<if test="poundlistPagination.startDate != null and poundlistPagination.endDate != null">
-			AND a.POUND_DATE &gt; #{poundlistPagination.startDate} AND a.POUND_DATE &lt;= #{poundlistPagination.endDate}
+			AND a.pound_date &gt; #{poundlistPagination.startDate} AND a.pound_date &lt;= #{poundlistPagination.endDate}
 		</if>
 		<if test="poundlistPagination.poundlistNo != null and poundlistPagination.poundlistNo != ''">
-			AND a.POUNDLIST_NO LIKE CONCAT('%',#{poundlistPagination.poundlistNo},'%')
+			AND a.poundlist_no LIKE CONCAT('%',#{poundlistPagination.poundlistNo},'%')
 		</if>
 		<if test="poundlistPagination.businessId != null and poundlistPagination.businessId != ''">
 			AND h.F_RealName LIKE CONCAT('%',#{poundlistPagination.businessId},'%')
@@ -100,6 +100,12 @@ WHERE a.delete_mark = 0 and
 		<if test="poundlistPagination.isExpense != null and poundlistPagination.isExpense != ''">
 			AND a.is_expense = #{poundlistPagination.isExpense}
 		</if>
+		<if test="poundlistPagination.purchaseStatus != null and poundlistPagination.purchaseStatus != ''">
+			AND a.purchase_status = #{poundlistPagination.purchaseStatus}
+		</if>
+		<if test="poundlistPagination.salesStatus != null and poundlistPagination.salesStatus != ''">
+			AND a.sales_status = #{poundlistPagination.salesStatus}
+		</if>
 		<if test="poundlistPagination.materialName != null and poundlistPagination.materialName != ''">
 			AND e.item_name LIKE CONCAT('%',#{poundlistPagination.materialName},'%')
 		</if>

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

@@ -592,7 +592,8 @@
             sums[index] = '';
           }
         });
-
+        this.dataForm.invoiceAmount = sums[5];
+        this.dataForm.invoiceQuantity = sums[4];
         return sums;
       },
       invoiceQuantityChange(row) {

SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue

@@ -725,7 +725,7 @@
         isDetail: false,
         dataForm: {
           isTransfer: '',
-          purchaseOrderId: '',
+          purchaseOrderId: [],
           documentNo: '',
           contractId: '',
           customerId: '',
@@ -1002,6 +1002,7 @@
         this.dataForm.customerName = list[0].customerName
         this.dataForm.isTransfer = list.isTransfer
         this.dataForm.purchaseOrderId = list.purchaseOrderId
+        debugger
         var num = 0
         var amount = 0
         var advance = 0

SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue

@@ -557,7 +557,8 @@
             sums[index] = '';
           }
         });
-
+        this.dataForm.invoiceAmount = sums[5];
+        this.dataForm.invoiceQuantity = sums[4];
         return sums;
       },
       invoiceQuantityChange(row){

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

@@ -547,14 +547,14 @@
         }).catch(() => {})
       },
       toSaleHandle(){
-        if (!this.multipleSelectionItem.length || this.multipleSelectionItem.length != 1) {
-        	this.$message({
-        		type: 'error',
-        		message: '请选择一条数据',
-        		duration: 2500
-        	})
-        	return
-        }
+        // if (!this.multipleSelectionItem.length || this.multipleSelectionItem.length != 1) {
+        // 	this.$message({
+        // 		type: 'error',
+        // 		message: '请选择一条数据',
+        // 		duration: 2500
+        // 	})
+        // 	return
+        // }
         var flag = true;
         this.multipleSelectionItem.forEach((item,index) => {
           if(item.isTransfer == '1'){
@@ -571,25 +571,31 @@
         }
         console.log('aaaaaaa', this.multipleSelectionItem)
         var ids = '';
-        this.multipleSelectionItem[0].poundlistEntityList.forEach((item, index)=>{
-          ids = ids + item.id + ',';
-        });
+        this.multipleSelectionItem.forEach((item,index) => {
+          item.poundlistEntityList.forEach((item2,index) => {
+            ids = ids + item2.id + ',';
+          })
+        })
+        // this.multipleSelectionItem[0].poundlistEntityList.forEach((item, index)=>{
+        //   ids = ids + item.id + ',';
+        // });
         if(ids.length > 0){
           ids = ids.substring(0, ids.length - 1);
         }
-        debugger
         request({
           url: `/api/poundlist/Poundlist/createsale/${ids}`,
           method: 'post'
         }).then(res => {
+          var purchaseIds = '';
+          this.multipleSelectionItem.forEach((item,index) => {
+            purchaseIds = purchaseIds + item.id + ',';
+          })
           var list = []
           for (let i = 0; i < res.data.length; i++) {
-            // res.data[i].isTransfer = '1'
-            // res.data[i].purchaseOrderId = this.multipleSelectionItem[0].id
             let _data = res.data[i]
-            _data.isTransfer = '1'
-            _data.purchaseOrderId = this.multipleSelectionItem[0].id
             list.push(_data)
+            list.purchaseOrderId = purchaseIds
+            list.isTransfer = '1'
           }
           if (list.length>0) {
             this.formVisible6 = true

SC-web/src/views/scm/basicInformation/tradeupload/Form3.vue

@@ -604,6 +604,7 @@
 							this.dataForm.businessName = this.$store.state.user.userInfo.userName;
 							this.dataForm.poundDate = new Date().getTime();
 							this.loading = false
+              debugger
 						});
 					} else {
 						this.clearData(this.dataForm)

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

@@ -155,13 +155,13 @@
                            width="200">
             <template slot-scope="scope">
               <el-button type="text"
-                         @click="continueUpload(scope.row.id)" v-has="'btn_continueUpload'">继续上传
+                         @click="continueUpload(scope.row.id)" v-has="'btn_submitDisabled'">继续上传
               </el-button>
               <el-button type="text"
                          @click="addOrUpdateHandle2(scope.row.id)" v-has="'btn_addOrUpdateHandle2'">审核
               </el-button>
                <el-button type="text"
-                         @click="addOrUpdateHandle(scope.row.id)">编辑
+                         @click="addOrUpdateHandle(scope.row.id)" v-has="'btn_edit'">编辑
               </el-button>
               <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)" v-has="'btn_remove'">删除
               </el-button>