yunxi
/
yueyueshu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat():sqlserver数据库连接

Browse Source
master
jiyufei 2 months ago
parent ab0d73badd
commit 098ac8f1a7
6 changed files with 84 additions and 322 deletions
Show Stats Download Patch File Download Diff File

2
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysDeviceDataEntity.java
Unescape View File

@ -50,7 +50,7 @@ public class YysDeviceDataEntity {
private String dayStopNum;
@TableField(value = "OEE" , updateStrategy = FieldStrategy.IGNORED)
private BigDecimal oee;
@TableField(value = "SYNCID" , updateStrategy = FieldStrategy.IGNORED)
@TableField(value = "SYNC_ID" , updateStrategy = FieldStrategy.IGNORED)
private Long syncId;
@TableField("F_CREATOR_TIME")
private Date creatorTime;

2
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysDeviceWarnStatisticsEntity.java
Unescape View File

@ -30,7 +30,7 @@ public class YysDeviceWarnStatisticsEntity {
private String warnDetails;
@TableField(value = "WARN_TYPE" , updateStrategy = FieldStrategy.IGNORED)
private String warnType;
@TableField(value = "SYNCID" , updateStrategy = FieldStrategy.IGNORED)
@TableField(value = "SYNC_ID" , updateStrategy = FieldStrategy.IGNORED)
private Long syncId;
@TableField("F_CREATOR_TIME")
private Date creatorTime;

392
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementorder/index.vue
Unescape View File

@ -5,81 +5,45 @@
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="采购单号">
<el-input
v-model="query.orderNumber"
placeholder="请输入"
clearable
>
<el-input v-model="query.orderNumber" placeholder="请输入" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="采购计划单号">
<el-input
v-model="query.procurementNumber"
placeholder="请输入"
clearable
>
<el-input v-model="query.procurementNumber" placeholder="请输入" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="物料名称">
<el-input
v-model="query.materialName"
placeholder="请输入"
clearable
>
<el-input v-model="query.materialName" placeholder="请输入" clearable>
</el-input>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="供应商">
<el-input
v-model="query.supplier"
placeholder="请输入"
clearable
>
<el-input v-model="query.supplier" placeholder="请输入" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据状态">
<JnpfSelect
v-model="query.orderStatus"
placeholder="请选择"
clearable
:options="orderStatusOptions"
:props="orderStatusProps"
multiple
>
<JnpfSelect v-model="query.orderStatus" placeholder="请选择" clearable :options="orderStatusOptions"
:props="orderStatusProps" multiple>
</JnpfSelect>
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"
>查询</el-button
>
<el-button icon="el-icon-refresh-right" @click="reset()"
>重置</el-button
>
<el-button
type="text"
icon="el-icon-arrow-down"
@click="showAll = true"
v-if="!showAll"
>
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开
</el-button>
<el-button
type="text"
icon="el-icon-arrow-up"
@click="showAll = false"
v-else
>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起
</el-button>
</el-form-item>
@ -89,318 +53,112 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button
type="primary"
icon="icon-ym icon-ym-btn-add"
v-has="'btn_add'"
@click="addOrUpdateHandle()"
>新增
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
</el-button>
<el-button
type="text"
icon="icon-ym icon-ym-btn-download"
@click="exportData()"
v-has="'btn_download'"
>导出
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link
icon="icon-ym icon-ym-filter JNPF-common-head-icon"
:underline="false"
@click="openSuperQuery()"
/>
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip
effect="dark"
:content="$t('common.refresh')"
placement="top"
>
<el-link
icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
:underline="false"
@click="initData()"
/>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
</el-tooltip>
</div>
</div>
<JNPF-table
v-loading="listLoading"
:data="list"
@sort-change="sortChange"
:span-method="arraySpanMethod"
border
>
<el-table-column
prop="orderNumber"
label="采购单号"
align="center"
width="150"
>
<JNPF-table v-loading="listLoading" :data="list" @sort-change="sortChange" :span-method="arraySpanMethod"
border>
<el-table-column prop="orderNumber" label="采购单号" align="center" width="150">
</el-table-column>
<el-table-column
prop="orderDate"
label="单据日期"
align="center"
width="150"
>
<el-table-column prop="orderDate" label="单据日期" align="center" width="150">
</el-table-column>
<el-table-column
prop="procurementNumber"
label="采购计划单号"
align="center"
width="150"
>
<el-table-column prop="procurementNumber" label="采购计划单号" align="center" width="150">
</el-table-column>
<el-table-column
prop="supplier"
label="供应商"
align="center"
width="150"
>
<el-table-column prop="supplier" label="供应商" align="center" width="150">
</el-table-column>
<el-table-column
prop="materialCode"
label="物料编码"
align="center"
width="150"
>
<el-table-column prop="materialCode" label="物料编码" align="center" width="150">
</el-table-column>
<el-table-column
prop="materialName"
label="物料名称"
align="center"
width="150"
>
<el-table-column prop="materialName" label="物料名称" align="center" width="150">
</el-table-column>
<el-table-column
prop="specification"
label="规格型号"
align="center"
width="150"
>
<el-table-column prop="specification" label="规格型号" align="center" width="150">
</el-table-column>
<el-table-column
prop="orderQuantity"
label="下单数量"
align="center"
width="150"
>
<el-table-column prop="orderQuantity" label="下单数量" align="center" width="150">
<template slot-scope="scope" v-if="scope.row.orderQuantity">
<JnpfNumber
v-model="scope.row.orderQuantity"
:thousands="false"
/>
<JnpfNumber v-model="scope.row.orderQuantity" :thousands="false" />
</template>
</el-table-column>
<el-table-column
prop="unit"
label="计量单位"
align="center"
width="150"
>
<el-table-column prop="unit" label="计量单位" align="center" width="150">
</el-table-column>
<el-table-column
prop="totalProductionQuantity"
label="总投产数量"
align="center"
width="150"
>
<template
slot-scope="scope"
v-if="scope.row.totalProductionQuantity"
>
<JnpfNumber
v-model="scope.row.totalProductionQuantity"
:thousands="false"
/>
<el-table-column prop="totalProductionQuantity" label="总投产数量" align="center" width="150">
<template slot-scope="scope" v-if="scope.row.totalProductionQuantity">
<JnpfNumber v-model="scope.row.totalProductionQuantity" :thousands="false" />
</template>
</el-table-column>
<el-table-column
prop="totalSendQuantity"
label="总发货数量"
align="center"
width="150"
>
<el-table-column prop="totalSendQuantity" label="总发货数量" align="center" width="150">
<template slot-scope="scope" v-if="scope.row.totalSendQuantity">
<JnpfNumber
v-model="scope.row.totalSendQuantity"
:thousands="false"
/>
<JnpfNumber v-model="scope.row.totalSendQuantity" :thousands="false" />
</template>
</el-table-column>
<el-table-column
prop="requestDeliveryDate"
label="要求到货日期"
align="center"
width="150"
>
<el-table-column prop="requestDeliveryDate" label="要求到货日期" align="center" width="150">
</el-table-column>
<el-table-column
prop="delayedDeliveryDate"
label="延期交货日期"
align="center"
width="150"
>
<el-table-column prop="delayedDeliveryDate" label="延期交货日期" align="center" width="150">
</el-table-column>
<el-table-column
prop="delayReason"
label="延期原因"
align="center"
width="150"
>
<el-table-column prop="delayReason" label="延期原因" align="center" width="150">
</el-table-column>
<el-table-column
prop="batchDeliveryDate"
label="分批发货日期"
align="center"
width="150"
>
<el-table-column prop="batchDeliveryDate" label="分批发货日期" align="center" width="150">
</el-table-column>
<el-table-column
prop="batchShipmentQuantity"
label="分批发货数量"
align="center"
width="150"
>
<el-table-column prop="batchShipmentQuantity" label="分批发货数量" align="center" width="150">
<template slot-scope="scope" v-if="scope.row.batchShipmentQuantity">
<JnpfNumber
v-model="scope.row.batchShipmentQuantity"
:thousands="false"
/>
<JnpfNumber v-model="scope.row.batchShipmentQuantity" :thousands="false" />
</template>
</el-table-column>
<el-table-column
prop="confirmQuantityReceived"
label="确认到货数量"
align="center"
width="150"
>
<template
slot-scope="scope"
v-if="scope.row.confirmQuantityReceived"
>
<JnpfNumber
v-model="scope.row.confirmQuantityReceived"
:thousands="false"
/>
<el-table-column prop="confirmQuantityReceived" label="确认到货数量" align="center" width="150">
<template slot-scope="scope" v-if="scope.row.confirmQuantityReceived">
<JnpfNumber v-model="scope.row.confirmQuantityReceived" :thousands="false" />
</template>
</el-table-column>
<el-table-column
label="单据状态"
prop="orderStatus"
align="center"
width="150"
>
<el-table-column label="单据状态" prop="orderStatus" align="center" width="150">
<template slot-scope="scope">
<el-tag
v-if="scope.row.orderStatus == '未接单'"
color="rgba(236, 128, 141, 1)"
effect="dark"
>未接单</el-tag
>
<el-tag
v-else-if="scope.row.orderStatus == '已接单'"
color="rgba(2, 167, 240, 1)"
effect="dark"
>已接单</el-tag
>
<el-tag
v-else-if="scope.row.orderStatus == '缺货结单'"
color="rgba(245, 154, 35, 1)"
effect="dark"
>缺货结单</el-tag
>
<el-tag
v-else-if="scope.row.orderStatus == '部分发货'"
color="rgba(99, 161, 3, 1)"
effect="dark"
>部分发货</el-tag
>
<el-tag
v-else-if="scope.row.orderStatus == '全部发货'"
color="rgba(25, 169, 152, 1)"
effect="dark"
>全部发货</el-tag
>
<el-tag
v-else-if="scope.row.orderStatus == '已发货'"
effect="plain"
>已发货</el-tag
>
<el-tag
type="success"
v-else-if="scope.row.orderStatus == '已到货'"
effect="plain"
>已到货</el-tag
>
<el-tag v-if="scope.row.orderStatus == '未接单'" color="rgba(236, 128, 141, 1)" effect="dark">未接单</el-tag>
<el-tag v-else-if="scope.row.orderStatus == '已接单'" color="rgba(2, 167, 240, 1)" effect="dark">已接单</el-tag>
<el-tag v-else-if="scope.row.orderStatus == '缺货结单'" color="rgba(245, 154, 35, 1)"
effect="dark">缺货结单</el-tag>
<el-tag v-else-if="scope.row.orderStatus == '部分发货'" color="rgba(99, 161, 3, 1)"
effect="dark">部分发货</el-tag>
<el-tag v-else-if="scope.row.orderStatus == '全部发货'" color="rgba(25, 169, 152, 1)"
effect="dark">全部发货</el-tag>
<el-tag v-else-if="scope.row.orderStatus == '已发货'" effect="plain">已发货</el-tag>
<el-tag type="success" v-else-if="scope.row.orderStatus == '已到货'" effect="plain">已到货</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button
type="text"
@click="addOrUpdateHandle(scope.row)"
v-has="'btn_edit'"
>编辑
<el-button type="text" v-show="scope.row.orderStatus != '全部发货'" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button
type="text"
v-show="scope.row.orderStatus == '已发货'"
@click="fnShowDialog(scope.row)"
v-has="'btn_edit'"
>确认到货
<el-button type="text" v-show="scope.row.orderStatus == '已发货'" @click="fnShowDialog(scope.row)"
v-has="'btn_edit'">确认到货
</el-button>
<el-button
type="text"
class="JNPF-table-delBtn"
v-has="'btn_remove'"
@click="handleDel(scope.row.id)"
>删除
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button
type="text"
v-has="'btn_detail'"
@click="goDetail(scope.row.id)"
>详情
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination
:total="total"
:page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize"
@pagination="initData"
/>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail
v-if="detailVisible"
ref="Detail"
@refresh="detailVisible = false"
/>
<ToFormDetail
v-if="toFormDetailVisible"
ref="toFormDetail"
@close="toFormDetailVisible = false"
/>
<SuperQuery
v-if="superQueryVisible"
ref="SuperQuery"
:columnOptions="superQueryJson"
@superQuery="superQuery"
/>
<DialogComponent
:showDialog.sync="showDialog"
@update:showDialog="showDialog = $event"
:onSubmit="handleSubmit"
/>
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
<DialogComponent :showDialog.sync="showDialog" @update:showDialog="showDialog = $event" :onSubmit="handleSubmit" />
</div>
</template>
@ -676,7 +434,7 @@ export default {
this.initData();
},
//初始化查询的默认数据
async initSearchData() {},
async initSearchData() { },
initData() {
this.listLoading = true;
let _query = {
@ -720,7 +478,7 @@ export default {
});
});
})
.catch(() => {});
.catch(() => { });
},
handelUpload() {
this.uploadBoxVisible = true;
@ -803,16 +561,16 @@ export default {
};
//console.log(_query);
request({
url: `/api/example/YysMaterialProcurementOrder/confirmQuantity`,
method: 'post',
data: _query
url: `/api/example/YysMaterialProcurementOrder/confirmQuantity`,
method: 'post',
data: _query
}).then(res => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
})
this.initData()
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
})
this.initData()
})
}
}

2
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/index.vue
Unescape View File

@ -73,7 +73,7 @@
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
<el-button type="text" v-show="scope.row.status == '已保存'" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除

4
jnpf-java-boot/jnpf-web/src/views/yys/yyspackagereport/index.vue
Unescape View File

@ -138,7 +138,9 @@
</el-table-column>
<el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
<el-button type="text" v-show="scope.row.status == '待确认'" @click="addOrUpdateHandle(scope.row)">编辑
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>

4
jnpf-java-boot/jnpf-web/src/views/yys/yysprodreport/index.vue
Unescape View File

@ -137,7 +137,9 @@
</el-table-column>
<el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
<el-button type="text" v-show="scope.row.status == '待确认'" @click="addOrUpdateHandle(scope.row)">编辑
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>

Write Preview
Loading…
Cancel
Save