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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-10-31 14:40:30 +08:00
parent 9656719e16
commit 9313072d51
4 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,9 @@ public class PointStatusServiceImpl implements PointStatusService {
if (StrUtil.isEmpty(container_name)) {
throw new BadRequestException("空轴/母卷不能为空！");
}
//查询该编码是否属于母卷
JSONObject raw_jo = WQLObject.getWQLObject("pdm_bi_rawfoilworkorder").query("container_name = '"+container_name+" AND is_delete = '0'").uniqueResult(0);
//查询该点对应的是什么位置
JSONObject cut_point = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("full_point_code = '" + point_code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(cut_point)) {
@@ -39,6 +42,9 @@ public class PointStatusServiceImpl implements PointStatusService {
if (StrUtil.isNotEmpty(now_container_name)) {
throw new BadRequestException("该点位上已存在母卷，不能进行绑定！");
}
if (ObjectUtil.isEmpty(raw_jo)){
throw new BadRequestException("请输入正确的母卷号！");
}
cut_point.put("container_name", container_name);
cut_point.put("full_point_status", "02");
} else {
@@ -48,6 +54,9 @@ public class PointStatusServiceImpl implements PointStatusService {
if (StrUtil.isNotEmpty(empty_vehicle_code)) {
throw new BadRequestException("该点位上已存在空轴，不能进行绑定！");
}
if (ObjectUtil.isNotEmpty(raw_jo)){
throw new BadRequestException("请输入正确的空轴号！");
}
cut_point.put("empty_vehicle_code", container_name);
cut_point.put("empty_point_status", "02");
} else {
@@ -66,10 +75,6 @@ public class PointStatusServiceImpl implements PointStatusService {
} else {
cut_point = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("empty_point_code = '" + point_code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(cut_point)) {
String empty_vehicle_code = cut_point.getString("empty_vehicle_code");
if (StrUtil.isNotEmpty(empty_vehicle_code)) {
throw new BadRequestException("该点位上已存在空轴，不能进行绑定！");
}
cut_point.put("empty_vehicle_code", "");
cut_point.put("empty_point_status", "01");
} else {

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

@@ -2,6 +2,7 @@
package org.nl.wms.pda.st.service.impl;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
@@ -62,7 +63,6 @@ public class ProductInstorServiceImpl implements ProductInstorService {
JSONArray box_rows = whereJson.getJSONArray("box_rows");
JSONArray rows = new JSONArray();
HashMap<String,String> map = new HashMap<>();
map.put("box_no",box_no);
if (option.equals("1")){
@@ -75,11 +75,30 @@ public class ProductInstorServiceImpl implements ProductInstorService {
//如果是入虚拟库直接入库并确认，如果是入成品库则生成入库单，生成一个二楼去一楼的任务
JSONObject mst_jo = new JSONObject();
mst_jo.put("tableData",box_rows);
mst_jo.put("bill_type",box_rows);
mst_jo.put("biz_date", DateUtil.now());
if (option.equals("1")){
mst_jo.put("bill_type","0003");
}
if (option.equals("2")){
mst_jo.put("bill_type","0001");
}
if (option.equals("3")){
mst_jo.put("bill_type","0002");
}
//查询成品库仓库
JSONObject stor = WQLObject.getWQLObject("st_ivt_bsrealstorattr").query("is_delete = '0' AND is_used = '1' AND is_productstore = '1'").uniqueResult(0);
mst_jo.put("stor_id",stor.getString("stor_id"));
mst_jo.put("detail_count",box_rows.size());
mst_jo.put("total_qty","0");
mst_jo.put("bill_status","10");
rawAssistIStorService.insertDtl(mst_jo);
//判断是否虚拟
if (!is_virtual.equals("1")){
//创建二楼去一楼的任务
}
JSONObject jo = new JSONObject();
jo.put("data",rows);
jo.put("message","查询成功！");
jo.put("message","确认成功！");
return jo;
}
}

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

Binary file not shown.

1
lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
View File

@@ -232,6 +232,7 @@
<el-table-column prop="is_parent_ok" label="母卷上料完成" width="100px" :formatter="formatParentName" />
<el-table-column prop="is_child_tz_ok" label="子卷套轴完成" width="100px" :formatter="formatChildName" />
<el-table-column prop="is_child_ps_ok" label="子卷配送完成" width="100px" :formatter="formatChildPsName" />
<el-table-column prop="qzzno" label="气涨轴编码" width="100px" />
<el-table-column prop="start_time" label="开始时间" width="150px" />
<el-table-column prop="end_time" label="结束时间" width="150px" />
<!-- <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">