付款申请子表、销售订单加备注

SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocEntity.java

@@ -147,4 +147,7 @@ public class PaymentdocEntity  {
     private String customerName;
     @TableField("num")
     private BigDecimal num;
+
+    @TableField(exist = false)
+    private List<PaymentdocEntity> PaymentdocEntityList1;
 }

SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem0Entity.java

@@ -7,6 +7,8 @@ import lombok.Data;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.math.BigDecimal;
+import java.util.List;
+
 /**
  *
  * 付款申请明细 
@@ -150,4 +152,7 @@ public class PaymentdocItem0Entity  {
     private String supplierId;
     @TableField(exist = false)
     private BigDecimal requestAmount;
+
+    @TableField(exist = false)
+    private List<PaymentdocEntity> paymentdocEntities;
 }

SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java

@@ -25,6 +25,10 @@ import jnpf.materialvo.service.MaterialService;
 import jnpf.mobilePort.utils.FileCopy;
 import jnpf.payment.model.payment.PaymentListVO;
 import jnpf.payment.service.PaymentService;
+import jnpf.paymentdoc.entity.PaymentdocEntity;
+import jnpf.paymentdoc.entity.PaymentdocItem0Entity;
+import jnpf.paymentdoc.service.PaymentdocItem0Service;
+import jnpf.paymentdoc.service.PaymentdocService;
 import jnpf.permission.service.UserService;
 import jnpf.poundlist.entity.PoundlistEntity;
 import jnpf.poundlist.service.PoundlistService;
@@ -141,6 +145,10 @@ public class PurchaseorderController {
     private Receiptin_item0Service receiptin_item0Service;
     @Autowired
     private VehicleService vehicleService;
+    @Autowired
+    private PaymentdocItem0Service paymentdocItem0Service;
+    @Autowired
+    private PaymentdocService paymentdocService;
 
     /**
      * 归档
@@ -677,6 +685,32 @@ public class PurchaseorderController {
             vo.setInvoicesitemEntity(invoicesitemList.get(0));
         }
 
+        QueryWrapper<PaymentdocItem0Entity> docItem0Wrapper = new QueryWrapper<>();
+        docItem0Wrapper.lambda().eq(PaymentdocItem0Entity::getPurchaseorderId, id);
+        List<PaymentdocItem0Entity> paymentdocItem0EntityList = paymentdocItem0Service.list(docItem0Wrapper);
+        List<PaymentdocEntity> PaymentdocEntity11 = new ArrayList<>();
+        if ( paymentdocItem0EntityList != null) {
+            for (int i=0;i<paymentdocItem0EntityList.size();i++){
+
+                QueryWrapper<PaymentdocEntity> docWrapper = new QueryWrapper<>();
+                docWrapper.lambda().eq(PaymentdocEntity::getId,paymentdocItem0EntityList.get(i).getPaymentdocId());
+//                PaymentdocEntity paymentdocEntity1=new PaymentdocEntity();
+//                paymentdocEntity1= (PaymentdocEntity) paymentdocService.list(docWrapper);
+                List<PaymentdocEntity> paymentdocEntityList = paymentdocService.list(docWrapper);
+                PaymentdocEntity11.addAll(paymentdocEntityList);
+//            paymentdocItem0Entity.setPaymentdocEntities(paymentdocEntityList);
+//            vo.setPaymentdocEntity(JsonUtil.getJsonToList(paymentdocEntityList, PaymentdocEntity.class));
+//            vo.setPaymentdocItem0EntityList(paymentdocItem0Entity);
+
+            }
+            vo.setPaymentdocEntityList(PaymentdocEntity11);
+        }
+//        else {
+//            vo.setPaymentdocEntity(new PaymentdocEntity());
+//        }
+
+
+
         QueryWrapper<ReceiptinEntity> receiptinWrapper = new QueryWrapper<>();
         receiptinWrapper.lambda().eq(ReceiptinEntity::getSouceno, id);
         ReceiptinEntity receiptinEntity = receiptinService.getOne(receiptinWrapper);
@@ -700,6 +734,8 @@ public class PurchaseorderController {
         purchasebackWrapper.lambda().eq(PurchasebackEntity::getPurchaseOrderId, id);
         List<PurchasebackEntity> PurchasebackList = purchasebackService.list(purchasebackWrapper);
         vo.setPurchasebackList(PurchasebackList);
+
+
         List<CollectionpoEntity> CollectionitemList = purchaseorderitemService.GetCollectionitemList(entity.getDocumentNo());
         for (CollectionpoEntity collectionpoEntity : CollectionitemList) {
         }

SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java

@@ -4,6 +4,9 @@
 package jnpf.purchaseorder.model.purchaseorder;
 
 import jnpf.payment.model.payment.PaymentListVO;
+import jnpf.paymentdoc.entity.PaymentdocEntity;
+
+import jnpf.paymentdoc.entity.PaymentdocItem0Entity;
 import jnpf.purchaseback.entity.PurchasebackEntity;
 import jnpf.purchaseback.entity.Purchaseback_item0Entity;
 import jnpf.purchaseorder.entity.InvoicesitemEntity;
@@ -174,4 +177,13 @@ public class PurchaseorderInfoVO{
 
         @JsonProperty("receiptinEntity")
         private ReceiptinEntity receiptinEntity;
+
+        @JsonProperty("PaymentdocEntity")
+        private List<PaymentdocEntity> paymentdocEntityList;
+
+//        @JsonProperty("PaymentdocEntity")
+//        private PaymentdocEntity paymentdocEntity;
+
+        @JsonProperty("PaymentdocItem0Entity")
+        private PaymentdocItem0Entity paymentdocItem0EntityList;
 }

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

@@ -493,6 +493,68 @@
               </el-tab-pane>
 
 
+              <el-tab-pane label="付款申请">
+                <el-col :span="24">
+                  <el-form-item label-width="0">
+                    <div class="JNPF-common-title">
+                      <h2></h2>
+                    </div>
+                    <el-table :data="dataForm.PaymentdocEntity" size='mini'>
+                      <el-table-column type="index" width="50" label="序号"  />
+
+                      <el-table-column prop="documentNo"  label="单据编号" >
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.documentNo" placeholder="请输入" clearable :disabled="true" :style='{"width":"100%"}'>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="paymentAmount"  label="付款金额 " >
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.paymentAmount" placeholder="请输入" clearable :disabled="true" :style='{"width":"100%"}'>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="ramount" label="申请金额" >
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.ramount" placeholder="请输入" clearable :disabled="true" :style='{"width":"100%"}'>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+
+
+                      <el-table-column prop="businessDate" label="退货时间">
+                        <template slot-scope="scope">
+                          <el-date-picker v-model="scope.row.businessDate" placeholder="请选择" clearable :disabled="true" :style='{"width":"100%"}'
+                                           type="date" format="yyyy-MM-dd" value-format="timestamp">
+                          </el-date-picker>
+                        </template>
+                      </el-table-column>
+
+                      <el-table-column prop="creatorUserName"  label="创建人" >
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.creatorUserName" placeholder="请输入" clearable :disabled="true" :style='{"width":"100%"}'>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="customerName" label="客户名称" >
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.customerName" placeholder="请输入" clearable :disabled="true" :style='{"width":"100%"}'>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="remark"label="备注" >
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.remark" placeholder="请输入" clearable :disabled="true" :style='{"width":"100%"}'>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+
+
+
+                    </el-table>
+                  </el-form-item>
+                </el-col>
+              </el-tab-pane>
 
 
 
@@ -724,6 +786,7 @@
           paymentList: [],
           purchasebackList: [],
           collectionitemList: [],
+          PaymentdocEntity:[],
         },
         activeypnmkv: '0',
         rules: {

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

@@ -322,6 +322,13 @@
             width="130"
             align="center"
           />
+          <el-table-column
+            prop="remark"
+            label="备注"
+            sortable
+            width="200"
+            align="center"
+          />
           <el-table-column
             label="操作"
             fixed="right"
@@ -442,6 +449,7 @@ export default {
         { prop: "bidSection", label: "所属标段" },
         { prop: "status", label: "单据状态 " },
         { prop: "creatorUserName", label: "制单人" },
+        { prop: "remark", label: "备注" },
       ],
       currencyOptions: [
         { fullName: "人民币", id: "0" },