采购订单详情修改数量字段

SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java

@@ -321,6 +321,15 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
     public Map<String, Object> importPreview(List<ContractFileModel> personList) {
         List<Map<String, Object>> dataRow = new ArrayList<>();
         List<Map<String, Object>> columns = new ArrayList<>();
+        String userId = userProvider.get().getUserId();
+        String orgnize = null;
+        if (!userProvider.get().getIsAdministrator()) {
+            orgnize = userProvider.getOrganizeId(userId);
+        }
+        String detpartment = null;
+        if (!userProvider.get().getIsAdministrator()) {
+            detpartment = userProvider.getDepartmentId(userId);
+        }
         if (personList != null) {
             for (int i = 0; i < personList.size(); i++) {
                 Map<String, Object> dataRowMap = new HashMap<>();
@@ -330,7 +339,10 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
                 queryWrapper
                         .eq("contract_name", model.getContractName())
                         .eq("contract_code", model.getContractCode())
-                        .eq("name", model.getName());
+                        .eq("name", model.getName())
+                        .eq("orgnize_id", orgnize)
+                        .eq("department_id", detpartment)
+                        ;
                 List<ContractFileEntity> list = contractFileMapper.selectList(queryWrapper);
                 if (list.size() > 0) {
                     System.out.println(list);
@@ -403,17 +415,21 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
     @Override
     public ContractfileImportVO importData(List<ContractFileModel> dt) {
         String userId = userProvider.get().getUserId();
+        String orgnize = null;
+        if (!userProvider.get().getIsAdministrator()) {
+            orgnize = userProvider.getOrganizeId(userId);
+        }
         String detpartment = null;
         if (!userProvider.get().getIsAdministrator()) {
             detpartment = userProvider.getDepartmentId(userId);
         }
-
         for (ContractFileModel model : dt) {
             QueryWrapper<UserEntity> queryuser = new QueryWrapper<UserEntity>();
             queryuser.eq("F_Id",userId);
             List<UserEntity> listuser = userMapper.selectList(queryuser);
             if (listuser.size() > 0) {
                 model.setOrgnizeId(listuser.get(0).getOrganizeId());
+                model.setDepartmentId(listuser.get(0).getDepartmentId());
             }
                 model.setCreatorTime(DateUtil.cstFormat(model.getCreatorTime()));
 //                model.setNum(DateUtil.cstFormat(model.getNum()));
@@ -422,7 +438,8 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
                         model.setContractType("0");
                         if (model.getName() != null) {
                             QueryWrapper<SupplierEntity> queryWrappers = new QueryWrapper<SupplierEntity>();
-                            queryWrappers.eq("supplier_name", model.getName());
+                            queryWrappers.eq("supplier_name", model.getName())
+                                            .eq("department_id",detpartment);
                             List<SupplierEntity> list = supplierMapper.selectList(queryWrappers);
                             if (list.size() > 0) {
                                 model.setCode(list.get(0).getId());
@@ -432,7 +449,8 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
                         model.setContractType("1");
                         if (model.getName() != null) {
                             QueryWrapper<CustomerEntity> queryWrappers = new QueryWrapper<CustomerEntity>();
-                            queryWrappers.eq("supplier_nm", model.getName());
+                            queryWrappers.eq("supplier_nm", model.getName())
+                                    .eq("orgnize_id",orgnize);
                             List<CustomerEntity> list = customerMapper.selectList(queryWrappers);
                             if (list.size() > 0) {
                                 model.setCode(list.get(0).getId());

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

@@ -26,9 +26,12 @@ public class Invoices_item0itemModel  {
     @JsonProperty("invoiceCode")
     private String invoiceCode;
 
+//    /** 数量 **/
+//    @JsonProperty("invoiceNum")
+//    private String invoiceNum;
     /** 数量 **/
-    @JsonProperty("invoiceNum")
+    @JsonProperty("invoiceQuantity")
-    private String invoiceNum;
+    private String invoiceQuantity;
 
     /** 金额 **/
     @JsonProperty("invoiceAmount")

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

@@ -310,9 +310,9 @@
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="invoiceNum" label="数量">
+                      <el-table-column prop="invoiceQuantity" label="数量">
                         <template slot-scope="scope">
-                          <el-input v-model="scope.row.invoiceNum" placeholder="请输入" clearable
+                          <el-input v-model="scope.row.invoiceQuantity" placeholder="请输入" clearable
                                     :style='{"width":"100%"}'>
                           </el-input>
                         </template>
@@ -712,7 +712,7 @@
           amount: 0,
           notAmount: 0,
           payPrice: 0,
-          invoiceNum: 0,
+          invoiceQuantity: 0,
           invoiceAmount: 0,
           erpNo: '',
           creatorUserName: "",