4.24测试问题修改

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ReturnCargoOrderMapper.xml

@@ -58,14 +58,12 @@
         WHEN '2' THEN
         '待审核'
         WHEN '3' THEN
-        '待锁定'
-        WHEN '4' THEN
         '待出库'
-        WHEN '5' THEN
+        WHEN '4' THEN
         '部分出库'
-        WHEN '6' THEN
+        WHEN '5' THEN
         '已完成'
-        WHEN '7' THEN
+        WHEN '6' THEN
         '已关闭'
         END
             WHEN document_type = '2' THEN
@@ -76,12 +74,14 @@
         WHEN '2' THEN
         '待审核'
         WHEN '3' THEN
-        '待出库'
+        '待锁定'
         WHEN '4' THEN
-        '部分出库'
+        '待出库'
         WHEN '5' THEN
-        '已完成'
+        '部分出库'
         WHEN '6' THEN
+        '已完成'
+        WHEN '7' THEN
         '已关闭'
         END
         END AS documentStatus1,

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessLineConfigServiceImpl.java

@@ -160,7 +160,7 @@ public class BusinessLineConfigServiceImpl extends ServiceImpl<BusinessLineConfi
                 allRuleIDlist = allRuleList;
             }
         }
-    boolean pcPermission = false;
+    boolean pcPermission = true;
     boolean appPermission = false;
     if(isPc && pcPermission){
     if (!userProvider.get().getIsAdministrator()){

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessLineServiceImpl.java

@@ -188,7 +188,7 @@ public class BusinessLineServiceImpl extends ServiceImpl<BusinessLineMapper, Bus
                 allRuleIDlist = allRuleList;
             }
         }
-    boolean pcPermission = false;
+    boolean pcPermission = true;
     boolean appPermission = false;
     if(isPc && pcPermission){
     if (!userProvider.get().getIsAdministrator()){

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java

@@ -260,7 +260,7 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
                 String value = businessOrderPagination.getBusinessType() instanceof List ?
                         JsonUtil.getObjectToString(businessOrderPagination.getBusinessType()) :
                         String.valueOf(businessOrderPagination.getBusinessType());
-                businessOrderQueryWrapper.like("a.business_type",value);
+                businessOrderQueryWrapper.eq("a.business_type",value);
 
             }
 
@@ -270,7 +270,7 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
                 String value = businessOrderPagination.getDeliveryType() instanceof List ?
                         JsonUtil.getObjectToString(businessOrderPagination.getDeliveryType()) :
                         String.valueOf(businessOrderPagination.getDeliveryType());
-                businessOrderQueryWrapper.like("a.delivery_type",value);
+                businessOrderQueryWrapper.eq("a.delivery_type",value);
 
             }
 
@@ -603,7 +603,7 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
                 String value = businessOrderPagination.getBusinessType() instanceof List ?
                         JsonUtil.getObjectToString(businessOrderPagination.getBusinessType()) :
                         String.valueOf(businessOrderPagination.getBusinessType());
-                businessOrderQueryWrapper.like("a.business_type",value);
+                businessOrderQueryWrapper.eq("a.business_type",value);
 
             }
 
@@ -613,7 +613,7 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
                 String value = businessOrderPagination.getDeliveryType() instanceof List ?
                         JsonUtil.getObjectToString(businessOrderPagination.getDeliveryType()) :
                         String.valueOf(businessOrderPagination.getDeliveryType());
-                businessOrderQueryWrapper.like("a.delivery_type",value);
+                businessOrderQueryWrapper.eq("a.delivery_type",value);
 
             }
 

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java

@@ -154,7 +154,7 @@ public class VoucherController {
         List<Map<String, Object>> realList=new ArrayList<>();
         for (VoucherEntity entity : list) {
             List<String> placeDispatchArr = JSON.parseArray(entity.getPlaceDispatch(), String.class);
-            List<String> destinationArr = JSON.parseArray(entity.getPlaceDispatch(), String.class);
+            List<String> destinationArr = JSON.parseArray(entity.getDestination(), String.class);
             List<ProvinceEntity> placeDispatchList = provinceService.getProList(placeDispatchArr);
             List<ProvinceEntity> destinationList = provinceService.getProList(destinationArr);
             List<String> placeDispatchs =  placeDispatchList.stream().map(ProvinceEntity::getFullName).collect(Collectors.toList());

jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/form.vue

@@ -500,11 +500,10 @@
                       @change="changeData('vouchervehicle-vehicleId', scope.$index)"
                       :rowIndex="scope.$index" :formData="dataForm"
                       :templateJson="interfaceRes.vouchervehiclevehicleId" placeholder="请选择"
-                      :disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-vehicleId')"
+                      :disabled="true" propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      popupType="dialog" relationField='vehicle_number'
-                      relationField='vehicle_number' :field="'vehicleId' + scope.$index"
+                      :field="'vehicleId' + scope.$index" interfaceId="529920852288864453"
-                      interfaceId="529920852288864453" :pageSize="20"
+                      :pageSize="20" :columnOptions="vouchervehiclevehicleIdcolumnOptions" clearable
-                      :columnOptions="vouchervehiclevehicleIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>

jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue

@@ -1436,7 +1436,7 @@ export default {
       currencyProps: { "label": "fullName", "value": "id" },
       saleModeOptions: [{ "fullName": "以销定采", "id": "1" }, { "fullName": "以采定销", "id": "2" }],
       saleModeProps: { "label": "fullName", "value": "id" },
-      correlatedOrderIdcolumnOptions: [{ "label": "订单编号", "value": "code" }, { "label": "单据类型", "value": "order_type" }, { "label": "是否紧急订单", "value": "urgent_order" },],
+      correlatedOrderIdcolumnOptions: [{ "label": "订单编号", "value": "code" }, { "label": "单据类型", "value": "orderType1" }, { "label": "状态", "value": "saleStatus" },],
       fixPriceModeOptions: [{ "fullName": "锁价模式", "id": "1" }, { "fullName": "后结算模式", "id": "2" }],
       fixPriceModeProps: { "label": "fullName", "value": "id" },
       secondSubjectBasicIdcolumnOptions: [{ "label": "供应商名称", "value": "name" }, { "label": "国家", "value": "country" }, { "label": "地址", "value": "address" }, { "label": "电话", "value": "phone" }],

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/form.vue

@@ -469,7 +469,9 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.driverName"
                       @change="changeData('vouchervehicle-driverName', scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入"
+                      :disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-driverName')"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -482,7 +484,9 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.telephone"
                       @change="changeData('vouchervehicle-telephone', scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入"
+                      :disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-telephone')"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -495,7 +499,8 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.carrier"
                       @change="changeData('vouchervehicle-carrier', scope.$index)" placeholder="请输入"
-                      :disabled="true" clearable :style='{ "width": "100%" }'>
+                      :disabled="judgeWrite('vouchervehicleList') || judgeWrite('vouchervehicleList-carrier')"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue

@@ -1349,7 +1349,7 @@ export default {
       currencyProps: { "label": "fullName", "value": "id" },
       saleModeOptions: [{ "fullName": "以销定采", "id": "1" }, { "fullName": "以采定销", "id": "2" }],
       saleModeProps: { "label": "fullName", "value": "id" },
-      correlatedOrderIdcolumnOptions: [{ "label": "订单编号", "value": "code" }, { "label": "单据类型", "value": "order_type" }, { "label": "是否紧急订单", "value": "urgent_order" },],
+      correlatedOrderIdcolumnOptions: [{ "label": "订单编号", "value": "code" }, { "label": "单据类型", "value": "orderType1" }, { "label": "状态", "value": "purchaseStatus" },],
       fixPriceModeOptions: [{ "fullName": "锁价模式", "id": "1" }, { "fullName": "后结算模式", "id": "2" }],
       fixPriceModeProps: { "label": "fullName", "value": "id" },
       secondSubjectBasicIdcolumnOptions: [{ "label": "客户名称", "value": "name" }, { "label": "国家", "value": "country" }, { "label": "地址", "value": "address" }, { "label": "电话", "value": "phone" }],
@@ -1791,6 +1791,7 @@ export default {
         this.dataForm.businessOrderProductRelationalList = data[0].businessOrderProductRelationalList
       }
       if (data.flag == '发货凭证生成销售订单') {
+        debugger
         this.productCreate = true
         this.dataForm.orderType = '3'
         this.dataForm.enterpriseId = data[0].supplierId

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOutBoundNotice/form.vue

@@ -924,6 +924,7 @@ export default {
               item.warehousingUnitId = item.salesMainUnitId;
             }
           );
+          debugger
           this.dataForm.warehousingProductList =
             saleOrder.businessOrderProductRelationalList;
         });