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

冲突修改

Browse Source
This commit is contained in:
liyongde
2023-03-28 19:03:49 +08:00
parent 4885d9b897 f87e58c08d
commit cf1e5cd6c0
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/position/service/dto/CachelinePositionDto.java
View File

@@ -21,7 +21,7 @@ public class CachelinePositionDto implements Serializable {
private String position_name; private String position_name;
/** 位置顺序号 */ /** 位置顺序号 */
private BigDecimal positionOrder_no; private BigDecimal positionorder_no;
/** 缓存线编码 */ /** 缓存线编码 */
private String cacheline_code; private String cacheline_code;

11
mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java
View File

@@ -457,7 +457,6 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
afterIvt.put("vehmaterial_id", IdUtil.getStringId()); afterIvt.put("vehmaterial_id", IdUtil.getStringId());
afterIvt.put("vehicle_code", vehicle_code); afterIvt.put("vehicle_code", vehicle_code);
afterIvt.put("cacheLine_code", cacheLine_code); afterIvt.put("cacheLine_code", cacheLine_code);
afterIvt.put("position_code", position_code);
afterIvt.put("vehicle_status", "1"); afterIvt.put("vehicle_status", "1");
afterIvt.put("update_time", DateUtil.now()); afterIvt.put("update_time", DateUtil.now());
afterIvt.put("create_time", DateUtil.now()); afterIvt.put("create_time", DateUtil.now());
@@ -466,12 +465,12 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
// 出空箱 // 出空箱
if("2".equals(inOut_type)) { if("2".equals(inOut_type)) {
// 缓存线载具物料表 // 缓存线载具物料表
JSONObject json = vehMaterTab.query("cacheLine_code = '" + position_code + "' and vehicle_status= '1' and vehicle_code = '" + vehicle_code + "'").uniqueResult(0); JSONObject json = vehMaterTab.query("cacheLine_code = '" + cacheLine_code + "'and vehicle_code = '" + vehicle_code + "' and vehicle_status= '1'").uniqueResult(0);
if(json == null) { if(json == null) {
throw new BadRequestException("无法找到缓存线【" + cacheLine_code + "】的空箱【" + vehicle_code + "】，出空箱失败"); throw new BadRequestException("无法找到缓存线【" + cacheLine_code + "】的空箱【" + vehicle_code + "】，出空箱失败");
} }
// 删除掉出库的箱子及关联物料 // 删除掉出库的箱子及关联物料
result = vehMaterTab.delete("cacheLine_code = '" + position_code + "' and vehicle_code = '" + vehicle_code + "'").getSucess(); result = vehMaterTab.delete("cacheLine_code = '" + cacheLine_code + "' and vehicle_code = '" + vehicle_code + "'").getSucess();
} }
return Integer.toString(result); return Integer.toString(result);
} }
@@ -637,7 +636,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
@Override @Override
public String cacheLineOutBoxExceptionConfirm(JSONObject param) { public String cacheLineOutBoxExceptionConfirm(JSONObject param) {
String inOut_type = param.getString("inOut_type"); String inOut_type = param.getString("inOut_type");
String wcsdevice_code = param.getString("wcsdevice_code"); String cacheLine_code = param.getString("wcsdevice_code");
String position_code = param.getString("position_code"); String position_code = param.getString("position_code");
String vehicle_code = param.getString("vehicle_code"); String vehicle_code = param.getString("vehicle_code");
//缓存线位置表 //缓存线位置表
@@ -645,7 +644,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
// 缓存线载具物料表 // 缓存线载具物料表
WQLObject ivtTab = WQLObject.getWQLObject("sch_cacheline_vehilematerial"); WQLObject ivtTab = WQLObject.getWQLObject("sch_cacheline_vehilematerial");
//1.确定缓存线点位 //1.确定缓存线点位
JSONObject vehiobj = positionTab.query("position_code = " + position_code + " and cacheLine_code like '%" + wcsdevice_code + "%'").uniqueResult(0); JSONObject vehiobj = positionTab.query("position_code = " + position_code + " and cacheLine_code like '%" + cacheLine_code + "%'").uniqueResult(0);
//2.绑定新料箱条码（入满箱或者入空箱），设置缓存线点位不为空 //2.绑定新料箱条码（入满箱或者入空箱），设置缓存线点位不为空
vehiobj.put("vehicle_code", vehicle_code); vehiobj.put("vehicle_code", vehicle_code);
vehiobj.put("is_empty", "0"); vehiobj.put("is_empty", "0");
@@ -655,7 +654,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
//4.初始化料箱 //4.初始化料箱
HashMap<String,String> json = new HashMap<>(); HashMap<String,String> json = new HashMap<>();
json.put("vehicle_code", vehicle_code); json.put("vehicle_code", vehicle_code);
json.put("cacheLine_code", position_code); json.put("cacheLine_code", cacheLine_code);
json.put("vehmaterial_id", IdUtil.getStringId()); json.put("vehmaterial_id", IdUtil.getStringId());
json.put("create_time", DateUtil.now()); json.put("create_time", DateUtil.now());
// 入满箱扫码异常 // 入满箱扫码异常