root/wuHanXinRui
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-08-04 16:38:28 +08:00
parent dc53ad0aee
commit f5913a3154
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/vehicle/service/impl/EmptyVehicleServiceImpl.java
View File

@@ -557,10 +557,12 @@ public class EmptyVehicleServiceImpl implements EmptyVehicleService {
line_jo.put("create_time", now); line_jo.put("create_time", now);
line_jo.put("update_optid", currentUserId); line_jo.put("update_optid", currentUserId);
line_jo.put("update_optname", SecurityUtils.getNickName()); line_jo.put("update_optname", SecurityUtils.getNickName());
if (ObjectUtil.isNotEmpty(obj)){
line_jo.put("workorder_id", obj.getString("workorder_id")); line_jo.put("workorder_id", obj.getString("workorder_id"));
line_jo.put("workordercard_id", obj.getString("workordercard_id")); line_jo.put("workordercard_id", obj.getString("workordercard_id"));
line_jo.put("worktaskno_id", obj.getString("worktask_id")); line_jo.put("worktaskno_id", obj.getString("worktask_id"));
line_jo.put("workprocedure_id", obj.getString("workprocedure_id")); line_jo.put("workprocedure_id", obj.getString("workprocedure_id"));
}
map.put("makeup_optid", currentUserId + ""); map.put("makeup_optid", currentUserId + "");
map.put("makeup_optname", SecurityUtils.getNickName()); map.put("makeup_optname", SecurityUtils.getNickName());
map.put("makeup_time", now); map.put("makeup_time", now);
@@ -591,7 +593,7 @@ public class EmptyVehicleServiceImpl implements EmptyVehicleService {
throw new PdaRequestException("点位不能为空！"); throw new PdaRequestException("点位不能为空！");
} }
//1、调用立库入库申请 /*//1、调用立库入库申请
HashMap<String ,String > map = new HashMap<>(); HashMap<String ,String > map = new HashMap<>();
map.put("mode","1"); map.put("mode","1");
map.put("station",point_code); map.put("station",point_code);
@@ -602,7 +604,7 @@ public class EmptyVehicleServiceImpl implements EmptyVehicleService {
if (!"1".equals(result)) { if (!"1".equals(result)) {
throw new PdaRequestException("入库申请失败:" + ret.getString("message")); throw new PdaRequestException("入库申请失败:" + ret.getString("message"));
} }
} }*/
//查询产品生产下线组盘表 //查询产品生产下线组盘表
JSONArray rows = WQL.getWO("QPAD_EMPTY_VEHICLE").addParam("flag","4").addParam("vehicle_code",vehicle_code).process().getResultJSONArray(0); JSONArray rows = WQL.getWO("QPAD_EMPTY_VEHICLE").addParam("flag","4").addParam("vehicle_code",vehicle_code).process().getResultJSONArray(0);

2
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/vehicle/wql/QPAD_EMPTY_VEHICLE.wql
View File

@@ -117,7 +117,7 @@
off.material_id, off.material_id,
mb.material_code, mb.material_code,
mb.material_name, mb.material_name,
off.qty, off.qty AS weight,
mu.ext_id AS unit_ext_id, mu.ext_id AS unit_ext_id,
off.qty_unit_id, off.qty_unit_id,
off.qty_unit_name, off.qty_unit_name,