出入库凭证修改为文本类型

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

@@ -836,7 +836,7 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
         organize = organize.replace("]","");
         QueryWrapper<VoucherEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("b.product_id",voucherPagination.getProductId());
-//        queryWrapper.eq("a.voucher_status","4"); //质检之后为4的凭证
+//        queryWrapper.eq("a.voucher_status","4"); //质检之后为4的凭证，暂时不使用
         queryWrapper.notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),"a.id",voucherPagination.getExcludeIdList());
         queryWrapper.in(ObjectUtils.isNotEmpty(voucherPagination.getProductIdList()),"b.product_id",voucherPagination.getProductIdList());
         queryWrapper.isNull("a.f_delete_mark");

jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue

@@ -181,12 +181,12 @@
                   </template>
                 </el-table-column> -->
 
-                <el-table-column label="关联凭证" prop="poundCode" align="center" width="250">
+                <el-table-column label="关联凭证" prop="voucherCode" align="center" width="250">
                   <template slot="header">
                     <span class="required-sign"></span>关联凭证
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.poundCode" placeholder="请输入" disabled clearable
+                    <JnpfInput v-model="scope.row.voucherCode" placeholder="请输入" disabled clearable
                       :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
@@ -809,8 +809,8 @@ export default {
           vehicleId: e.vehicleId,
           productId: e.productId,
           voucherId: e.id,
-          poundCode: e.voucherCode,
-          // poundCode: e.poundCode,
+          voucherCode: e.voucherCode,
+          poundCode: e.poundCode,
           poundlistTime: e.poundlistTime,
           vehicleNumber: e.vehicleNumber,
           unit: e.unit,

jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/form.vue

@@ -180,12 +180,12 @@
                   </template>
                 </el-table-column> -->
 
-                <el-table-column label="关联凭证" prop="poundCode" align="center" width="250">
+                <el-table-column label="关联凭证" prop="voucherCode" align="center" width="250">
                   <template slot="header">
                     <span class="required-sign"></span>关联凭证
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.poundCode" placeholder="请输入" disabled clearable
+                    <JnpfInput v-model="scope.row.voucherCode" placeholder="请输入" disabled clearable
                       :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
@@ -249,21 +249,21 @@
                       v-if="judgeRequired('warehousingstoragepoundlistList-poundlistTime')">*</span>磅单时间
                   </template>
                   <template slot-scope="scope">
-  <JnpfDatePicker v-model="scope.row.poundlistTime"
-    @change="changeData('warehousingoutboundpoundlist-poundlistTime', scope.$index)"
-    :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
-    placeholder="请选择"
-    :disabled="judgeWrite('warehousingstoragepoundlistList') || judgeWrite('warehousingstoragepoundlistList-poundlistTime')"
-    clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
-  </JnpfDatePicker>
-</template>
+                    <JnpfDatePicker v-model="scope.row.poundlistTime"
+                      @change="changeData('warehousingoutboundpoundlist-poundlistTime', scope.$index)"
+                      :startTime="dateTime(false, 1, 1, '', '')"
+                      :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                      :disabled="judgeWrite('warehousingstoragepoundlistList') || judgeWrite('warehousingstoragepoundlistList-poundlistTime')"
+                      clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
+                    </JnpfDatePicker>
+                  </template>
                 </el-table-column>
 
                 <el-table-column label="车辆信息" prop="vehicleName" align="center" width="150">
 
                   <template slot="header">
-  <span class="required-sign"></span>车辆信息
-</template>
+                    <span class="required-sign"></span>车辆信息
+                  </template>
 
                   <template slot-scope="scope">
   <JnpfInput v-model="scope.row.vehicleName" placeholder="请输入" disabled clearable
@@ -837,10 +837,10 @@ export default {
         const e = list[i];
         let item = {
           voucherId: e.id,
-          poundCode: e.voucherCode,
+          voucherCode: e.voucherCode,
           documentTypes: e.documentType1,
           voucherTypes: e.voucherType1,
-          // poundCode: e.poundCode,
+          poundCode: e.poundCode,
           poundlistTime: e.poundlistTime,
           vehicleName: e.vehicleNumber,
           unit: e.unit,