From 90f906c4f8624cdf93838352804cef224ae28e98 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 4 Nov 2024 14:57:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=BE=93=E9=80=81?= =?UTF-8?q?=E7=BA=BF=E6=90=AC=E8=BF=90=E4=BB=BB=E5=8A=A1=E4=B8=8E=E6=89=8B?= =?UTF-8?q?=E6=8C=81=E5=B7=A5=E5=8D=95=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/pda/service/dao/vo/FjOrderVo.java | 2 + .../wms/pda/service/impl/PdaServiceImpl.java | 4 +- .../dao/mapper/PdmBdWorkorderMapper.xml | 1 + .../impl/PdmBdWorkorderServiceImpl.java | 52 ++++++++++--------- .../main/java/org/nl/wms/util/TaskUtils.java | 16 ++++++ 5 files changed, 48 insertions(+), 27 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/FjOrderVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/FjOrderVo.java index bee41e3..7b0037f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/FjOrderVo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/FjOrderVo.java @@ -27,6 +27,8 @@ public class FjOrderVo { private String material_name; /** 物料规格 */ private String material_spec; + /** 砖型 */ + private String material_model; private String ext_data; /** 订单号 */ private String order_no; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java index d7c8b8b..528b314 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java @@ -445,7 +445,7 @@ public class PdaServiceImpl implements PdaService { for (FjOrderVo order : orders) { String extData = order.getExt_data(); if (ObjectUtil.isNotEmpty(extData)) { - JSONObject object = JSONObject.parseObject(extData); + JSONObject object = TaskUtils.parseObject(extData, "客户/订单信息"); order.setOrder_no(ObjectUtil.isNotEmpty(object.getString("order_no")) ? object.getString("order_no") : "-"); order.setCuster_no(ObjectUtil.isNotEmpty(object.getString("custer_no")) @@ -505,7 +505,7 @@ public class PdaServiceImpl implements PdaService { workorderService.updateById(order); // 创建任务 JSONObject taskParam = new JSONObject(); - taskParam.put("device_code", "RGCDW01"); + taskParam.put("device_code", "RGMDW01"); taskParam.put("config_code", "RGBZTask"); taskParam.put("vehicle_code", vehicleCode); taskParam.put("vehicle_type", vehicleType); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml index bebe0fd..e9de1f3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml @@ -170,6 +170,7 @@ ,ma.material_name ,ma.material_code ,ma.material_spec + ,ma.material_model ,ma.half_material_code FROM pdm_bd_workorder wo LEFT JOIN md_base_material ma ON ma.material_id = wo.material_id diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java index 910f2d8..0d49b18 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java @@ -107,10 +107,9 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl inventoryCeil ? BigDecimal.valueOf(inventoryCeil) : BigDecimal.valueOf(ceil)); + entity.setPlan_weight(ceil > inventoryCeil ? BigDecimal.valueOf(inventoryQty) : BigDecimal.valueOf(residueNum)); // 对于分拣就是计划钢托盘上的砖数量 + entity.setProduce_order(entity.getOrder_no()); } - // 计划量 - int orderSubnum = entity.getOrder_subnum(); - // 已经包装数 - int guadansum = entity.getGuadansum(); - // 剩余数 - int residueNum = orderSubnum - guadansum; - int multiply = TaskUtils.convertMultiply(entity.getPack_method()); - // 计算需要多少木托 - int ceil = (int) Math.ceil(residueNum / multiply); - // 获取此物料在库存中有多少 - int inventoryQty = vehiclematerialgroupService.getInventoryQtyByMaterialId(entity.getMaterial_id()); - // 查看库存能有多少托 - int inventoryCeil = (int) Math.ceil(inventoryQty / multiply); // 工单号和客户编码存放json JSONObject res = new JSONObject(); res.put("order_no", entity.getOrder_no()); res.put("custer_no", entity.getCuster_no()); - entity.setPlan_qty(ceil > inventoryCeil ? BigDecimal.valueOf(inventoryCeil) : BigDecimal.valueOf(ceil)); entity.setExt_data(res.toJSONString()); - entity.setPlan_weight(ceil > inventoryCeil ? BigDecimal.valueOf(inventoryQty) : BigDecimal.valueOf(residueNum)); // 对于分拣就是计划钢托盘上的砖数量 - entity.setProduce_order(entity.getOrder_no()); } @Override diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java index 9a141a2..4ab86d2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; +import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.config.SpringContextHolder; import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; @@ -223,4 +224,19 @@ public class TaskUtils { } return result; } + + /** + * 转换JSONObject + * @param param + * @return + */ + public static JSONObject parseObject(String param, String tip) { + JSONObject jsonObject; + try { + jsonObject = JSONObject.parseObject(param); + } catch (Exception e) { + throw new BadRequestException("转化JSON错误, " + tip + "：{" + param + "}"); + } + return jsonObject; + } }