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

Merge remote-tracking branch 'origin/master_merge' into master_merge

Browse Source
This commit is contained in:
zhouz
2024-06-27 17:00:21 +08:00
parent 430f4c795a e88415bada
commit 2a370376be
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/BstIvtPackageinfoivt.java
View File

@@ -136,10 +136,25 @@ public class BstIvtPackageinfoivt extends Model<BstIvtPackageinfoivt> {
private String plan; private String plan;
/** /**
* 规划 * 所属等待点
*/ */
private String wait_point_type; private String wait_point_type;
/**
* 排
*/
private String row_num;
/**
* 列
*/
private String col_num;
/**
* 深浅位
*/
private String depth;
/** /**
* 获取主键值 * 获取主键值
* *

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
View File

@@ -422,7 +422,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
BstIvtPackageinfoivt dto = bstIvtPackageinfoivtMapper.selectOne(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getContainer_name, whereJson.getString("container_name"))); BstIvtPackageinfoivt dto = bstIvtPackageinfoivtMapper.selectOne(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getContainer_name, whereJson.getString("container_name")));
if (dto == null) { if (dto == null) {
result.put("status", org.springframework.http.HttpStatus.BAD_REQUEST.value()); result.put("status", org.springframework.http.HttpStatus.BAD_REQUEST.value());
result.put("message", "不存在该数据！"); result.put("message", "子卷号有误，请核对是否存在！");
return result; return result;
} }
dto.setIvt_status(whereJson.getString("ivt_status")); dto.setIvt_status(whereJson.getString("ivt_status"));

2
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java
View File

@@ -469,7 +469,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
@Override @Override
public JSONObject getTubeMsg(JSONObject whereJson) { public JSONObject getTubeMsg(JSONObject whereJson) {
String api = "api/wms/getTubeMes"; String api = "api/wms/getTubeMsg";
JSONArray arr = new JSONArray(); JSONArray arr = new JSONArray();
arr.add(whereJson); arr.add(whereJson);
return AcsUtil.notifyAcs(api, arr); return AcsUtil.notifyAcs(api, arr);

2
lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue
View File

@@ -39,7 +39,7 @@
> >
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column prop="box_no" label="木箱号" /> <el-table-column prop="box_no" label="木箱号" />
<el-table-column prop="material_code" label="物料编码" /> <el-table-column prop="material_code" label="木箱规格" />
<el-table-column prop="material_name" label="物料名称" /> <el-table-column prop="material_name" label="物料名称" />
<el-table-column prop="box_length" label="木箱长度" /> <el-table-column prop="box_length" label="木箱长度" />
<el-table-column prop="box_width" label="木箱宽度" /> <el-table-column prop="box_width" label="木箱宽度" />