root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:查询冷却区点位

Browse Source
This commit is contained in:
zhouz
2024-04-12 15:53:55 +08:00
parent 75cd58da75
commit e492d71238
7 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
View File

@@ -179,7 +179,7 @@ public class BakingServiceImpl implements BakingService {
*/
// 1.根据冷却区此母卷的点位找到对应的暂存区、找到空位
JSONObject jsonCoolIvt = coolIvtTab.query("full_point_code = '" + point_code1 + "' and is_used = '1'").uniqueResult(0);
JSONObject jsonCoolIvt = coolIvtTab.query("full_point_code = '" + point_code1 + "' and is_used = '1' AND point_type = '1'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonCoolIvt)) {
throw new BadRequestException("请扫描正确的冷却区或对接点位！");
}

1
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
View File

@@ -152,6 +152,7 @@
AND full_point_status = '01'
AND empty_point_status = '01'
AND is_used = '1'
AND point_type = '1'
AND NOT EXISTS (
SELECT

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql
View File

@@ -56,6 +56,8 @@
ivt.full_point_status = '01'
AND
ivt.is_used = '1'
AND
point_type = '1'
AND NOT EXISTS (
SELECT
@@ -90,6 +92,8 @@
ST_IVT_CoolPointIvt ivt
WHERE
ivt.full_point_status = '01'
AND
point_type = '1'
AND
ivt.is_used = '1'
AND NOT EXISTS (

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolInServiceImpl.java
View File

@@ -67,7 +67,7 @@ public class CoolInServiceImpl implements CoolInService {
String is_bake = whereJson.getString("is_bake"); // 是否烘烤完成
// 查询终点在冷却区是否存在
JSONObject jsonCoolIvt = coolIvtTab.query("full_point_code = '" + point_code + "' and full_point_status = '01' and empty_point_status = '01' and is_used = '1'").uniqueResult(0);
JSONObject jsonCoolIvt = coolIvtTab.query("full_point_code = '" + point_code + "' and full_point_status = '01' and empty_point_status = '01' and is_used = '1' AND point_type = '1'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonCoolIvt)) {
throw new BadRequestException("冷却区不存在该满轴点位或空轴、满轴点位上有货！");
}

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolOutServiceImpl.java
View File

@@ -55,7 +55,7 @@ public class CoolOutServiceImpl
String point_code = whereJson.getString("point_code"); // 出库点位
// 查询终点在冷却区是否存在
JSONObject jsonCoolIvt = coolIvtTab.query("full_point_code = '" + point_code + "' and full_point_status = '02' and is_used = '1'").uniqueResult(0);
JSONObject jsonCoolIvt = coolIvtTab.query("full_point_code = '" + point_code + "' and full_point_status = '02' and is_used = '1' AND point_type = '1' ").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonCoolIvt)) {
throw new BadRequestException("点位：" + point_code + "不符，请扫描冷却区满轴点位！");
}

BIN
lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls
View File

Binary file not shown.

25
lms/nladmin-ui/src/views/b_lms/pdm/ivt/stpointivt/index.vue
View File

@@ -57,10 +57,10 @@
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="550px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;"/>
<el-input v-model="form.point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="载具编码">
<el-input v-model="form.vehicle_code" style="width: 370px;"/>
<el-input v-model="form.vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产区域">
<el-select
@@ -69,7 +69,6 @@
placeholder="生产区域"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.product_area"
@@ -94,19 +93,19 @@
</el-select>
</el-form-item>
<el-form-item label="上料位轴编码">
<el-input v-model="form.up_scroll" style="width: 370px;"/>
<el-input v-model="form.up_scroll" style="width: 370px;" />
</el-form-item>
<el-form-item label="上料位母卷号">
<el-input v-model="form.up_pcsn" style="width: 370px;"/>
<el-input v-model="form.up_pcsn" style="width: 370px;" />
</el-form-item>
<el-form-item label="下料位轴编码">
<el-input v-model="form.down_scroll" style="width: 370px;"/>
<el-input v-model="form.down_scroll" style="width: 370px;" />
</el-form-item>
<el-form-item label="下料位母卷号">
<el-input v-model="form.down_pcsn" style="width: 370px;"/>
<el-input v-model="form.down_pcsn" style="width: 370px;" />
</el-form-item>
<el-form-item label="外部编码">
<el-input v-model="form.ext_code" style="width: 370px;"/>
<el-input v-model="form.ext_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
@@ -131,10 +130,12 @@
{{ dict.label.point_location[scope.row.point_location] }}
</template>
</el-table-column>
<el-table-column prop="up_scroll" width="150" label="表处上料位轴编码" />
<el-table-column prop="up_pcsn" width="150" label="表处上料位母卷号" />
<el-table-column prop="down_scroll" width="150" label="表处下料位轴编码" />
<el-table-column prop="down_pcsn" width="150" label="表处下料位母卷号" />
<el-table-column prop="up_point_code" width="150" label="上料位点位编码" />
<el-table-column prop="up_scroll" width="150" label="上料位轴编码" />
<el-table-column prop="up_pcsn" width="150" label="上料位母卷号" />
<el-table-column prop="down_point_code" width="150" label="下料位点位编码" />
<el-table-column prop="down_scroll" width="150" label="下料位轴编码" />
<el-table-column prop="down_pcsn" width="150" label="下料位母卷号" />
<el-table-column prop="ext_code" label="外部编码" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="is_used" label="是否启用">