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

fix:重量校验

Browse Source
This commit is contained in:
zhouz
2024-06-30 15:18:44 +08:00
parent c0ba71e24b
commit 35ccff0564
11 changed files with 374 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,8 @@ import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService;
import org.nl.b_lms.sch.task.dao.SchBaseTask;
import org.nl.b_lms.sch.task.service.IschBaseTaskService;
import org.nl.b_lms.sch.tasks.TwoBoxExcepTask;
import org.nl.b_lms.sch.tasks.TwoExceptionInTask;
import org.nl.b_lms.sch.tasks.TwoOutHeapTask;
import org.nl.b_lms.sch.tasks.first_floor_area.MzhcwTask;
import org.nl.b_lms.sch.tasks.first_floor_area.SsxDjwTask;
import org.nl.b_lms.sch.tasks.slitter.service.SlitterService;
@@ -50,6 +52,7 @@ import org.nl.wms.pda.mps.service.CasingService;
import org.nl.wms.pda.mps.service.ShippingService;
import org.nl.wms.pda.mps.service.impl.BakingServiceImpl;
import org.nl.wms.pda.st.service.impl.PrintServiceImpl;
import org.nl.wms.sch.ComPareUtil;
import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.sch.tasks.CutConveyorTask;
import org.nl.wms.sch.tasks.EmptyVehicleTask;
@@ -295,7 +298,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
String type = whereJson.getString("type");
JSONObject result = new JSONObject();
RLock lock = redissonClient.getLock("acs_to_wms:" + type);
boolean tryLock = lock.tryLock(5,20, TimeUnit.SECONDS);
boolean tryLock = lock.tryLock(5, 20, TimeUnit.SECONDS);
try {
if (tryLock) {
String device_code = whereJson.getString("device_code");
@@ -554,8 +557,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
//判断是否开启了系统参数生成AGV搬运任务
String agv_transport = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("agv_transport").getValue();
//如果未开启AGV搬运则不创建从1016到发货区的任务
if (agv_transport.equals("0")){
log.info("未开启AGV搬运系统参数，不生成AGV搬运["+vehicle_code+"]任务！");
if (agv_transport.equals("0")) {
log.info("未开启AGV搬运系统参数，不生成AGV搬运[" + vehicle_code + "]任务！");
JSONArray sub_rows2 = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + vehicle_code + "'").getResultJSONArray(0);
for (int i = 0; i < sub_rows2.size(); i++) {
JSONObject sub_row = sub_rows2.getJSONObject(i);
@@ -735,7 +738,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (lock.isLocked() && lock.isHeldByCurrentThread()) {
try {
lock.unlock();
}catch (Exception ex){}
} catch (Exception ex) {
}
}
}
result.put("status", HttpStatus.BAD_REQUEST.value());
@@ -1438,9 +1442,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
ivt_shaftivt.update(point1_jo);
} else if ("010607".equals(point_type) || "010603".equals(point_type) || "010606".equals(point_type)) {
JSONObject point1_jo = ivt_shaftivt.query("point_code = '" + task_jo.getString("point_code1") + "'").uniqueResult(0);
if(point1_jo.getString("point_type").equals("1")){
if (point1_jo.getString("point_type").equals("1")) {
point1_jo.put("have_qzz", "0");
}else {
} else {
point1_jo.put("qzz_size", "");
point1_jo.put("qzz_generation", "");
point1_jo.put("have_qzz", "0");
@@ -1838,7 +1842,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
}
} else {
//如果满轴位没有可用的空点位，先创建一个桁架任务但是不下发，等这边空出来点位，判断是否有这种桁架任务然后补发；
List<SchBaseTask> existTaskList = getExistTasks(PackageInfoIvtEnum.TASK_TYPE.code("输送线->满轴缓存位"),containerName);
List<SchBaseTask> existTaskList = getExistTasks(PackageInfoIvtEnum.TASK_TYPE.code("输送线->满轴缓存位"), containerName);
//如果有就不创建，没有就创建
if (CollectionUtils.isEmpty(existTaskList)) {
//只确定起点NBJ1002
@@ -1978,8 +1982,33 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (whereJson.getIntValue("weight") <= 0) {
throw new BadRequestException("上报的重量不能为0!");
}
whereJson.put("bill_type", IOSEnum.IN_TYPE.code("生产入库"));
inBussManageService.inTask(whereJson);
JSONObject jsonObject = ComPareUtil.CompareWhight(whereJson);
if (jsonObject.getBoolean("compaer_result")) {
whereJson.put("bill_type", IOSEnum.IN_TYPE.code("生产入库"));
inBussManageService.inTask(whereJson);
} else {
JSONObject jsonTaskParam = new JSONObject();
//创建异常任务去异常入库口
//入库口
jsonTaskParam.put("point_code1", "RK1018");
//异常位
jsonTaskParam.put("point_code2", "RK1003");
jsonTaskParam.put("vehicle_code", jsonObject.getString("box_no"));
jsonTaskParam.put("vehicle_code2", whereJson.getString("vehicle_code"));
JSONObject request_param = new JSONObject();
if (whereJson.getString("vehicle_code").startsWith("A")) {
request_param.put("containerType", "2");
} else if (whereJson.getString("vehicle_code").startsWith("B")) {
request_param.put("containerType", "1");
} else {
throw new BadRequestException("托盘号有误，无法找到对应的托盘类型！");
}
jsonTaskParam.put("request_param", request_param);
TwoExceptionInTask bean = SpringContextHolder.getBean(TwoExceptionInTask.class);
bean.createTask(jsonTaskParam);
bean.immediateNotifyAcs(null);
}
} else if (type.equals(IOSEnum.ACSTOLMS_TYPE.code("空盘入库"))) {
// 2-空盘入库
whereJson.put("vehicle_type", whereJson.getString("container_type"));
@@ -2452,7 +2481,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
}
} catch (Exception e) {
log.info("1层空托盘区扩容失败："+e.getMessage());
log.info("1层空托盘区扩容失败：" + e.getMessage());
return;
}
@@ -2461,15 +2490,16 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
jsonParam.put("sect_id", RegionTypeEnum.KTP01.getId());
jsonParam.put("sect_code", "KTP01");
jsonParam.put("sect_name", RegionTypeEnum.KTP01.getName());
attr.update(jsonParam,"sect_code = 'ZC01' AND block_num = '"+block_num+"' AND row_num = '"+row_num+"' AND layer_num = '1'");
attr.update(jsonParam, "sect_code = 'ZC01' AND block_num = '" + block_num + "' AND row_num = '" + row_num + "' AND layer_num = '1'");
// 更新点位为主存区域
jsonParam.put("region_id", RegionTypeEnum.KTP01.getId());
jsonParam.put("region_code", "KTP01");
jsonParam.put("region_name", RegionTypeEnum.KTP01.getName());
point.update(jsonParam,"region_code = 'ZC01' AND block_num = '"+block_num+"' AND row_num = '"+row_num+"' AND layer_num = '1'");
point.update(jsonParam, "region_code = 'ZC01' AND block_num = '" + block_num + "' AND row_num = '" + row_num + "' AND layer_num = '1'");
}
@Override
public JSONObject actionFinishRequest2(JSONObject param) {
return slitterService.acsActionFinishRequestToRelease(param);

36
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
View File

@@ -527,7 +527,9 @@ public class MesToLmsServiceImpl implements MesToLmsService {
String SplitBreadth = param.getString("SplitBreadth"); // 子卷幅宽
String SplitHeight = param.getString("SplitHeight"); // 子卷理论长度
String SplitWeight = param.getString("SplitWeight"); // 子卷理论重量
String Attribute2 = param.getString("Attribute2"); // 销售订单及行号
// String Attribute2 = param.getString("Attribute2"); // 销售订单及行号
String Attribute2 = param.getString("Attribute2"); // 上下轴
String Attribute3 = param.getString("Attribute3"); // 位置左右
WQLObject tab = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan");
@@ -597,6 +599,8 @@ public class MesToLmsServiceImpl implements MesToLmsService {
* 1.当管件类型为1（纸筒）时 PaperTubeMaterial 纸筒物料编码、PaperTubeDescription 纸筒物料描述、PaperTubeModel 纸筒规格 不能为空
* 2.当管件类型为2（FRP管）时 FRPMaterial FRP管物料编码、FRPDescription FRP管物料描述、FRPModel FRP管规格 不能为空
*/
String qzz_generation = "0";
String qzz_size = "0";
if (StrUtil.equals(PaperTubeOrFRP, "1")) {
if (ObjectUtil.isEmpty(param.getString("PaperTubeMaterial"))) {
throw new BadRequestException("纸筒物料编码不能为空");
@@ -607,6 +611,16 @@ public class MesToLmsServiceImpl implements MesToLmsService {
if (ObjectUtil.isEmpty(param.getString("PaperTubeModel"))) {
throw new BadRequestException("纸筒规格不能为空");
}
if (param.getString("PaperTubeDescription").contains("3.12")) {
qzz_generation = "4";
}
if (param.getString("PaperTubeDescription").contains("3.15")) {
qzz_generation = "5";
}
// 解析描述数组
String[] tubeArray = param.getString("PaperTubeDescription").split("\\|");
// 定义尺寸与长度
qzz_size = Character.toString(tubeArray[2].charAt(0));
} else {
if (ObjectUtil.isEmpty(param.getString("FRPMaterial"))) {
throw new BadRequestException("FRP管物料编码不能为空");
@@ -617,6 +631,16 @@ public class MesToLmsServiceImpl implements MesToLmsService {
if (ObjectUtil.isEmpty(param.getString("FRPModel"))) {
throw new BadRequestException("FRP管规格不能为空");
}
if (param.getString("FRPDescription").contains("3.12")) {
qzz_generation = "4";
}
if (param.getString("FRPDescription").contains("3.15")) {
qzz_generation = "5";
}
// 解析描述数组
String[] tubeArray = param.getString("FRPDescription").split("\\|");
// 定义尺寸与长度
qzz_size = Character.toString(tubeArray[2].charAt(0));
}
JSONObject json = new JSONObject();
@@ -644,9 +668,17 @@ public class MesToLmsServiceImpl implements MesToLmsService {
json.put("split_breadth", SplitBreadth);
json.put("split_height", SplitHeight);
json.put("split_weight", SplitWeight);
json.put("sale_order_name", Attribute2);
json.put("up_or_down", Attribute2);
json.put("left_or_right", Attribute3);
json.put("qzz_size", qzz_size);
if (ResourceName.startsWith("B5") || ResourceName.startsWith("B6")) {
json.put("is_paper_ok", "1");
}
// json.put("sale_order_name", Attribute2);
json.put("start_time", DateUtil.now());
json.put("status", "01");
json.put("qzz_generation", qzz_generation);
json.put("is_parent_ok", "0");
json.put("is_child_tz_ok", "0");
json.put("is_child_ps_ok", "0");

76
lms/nladmin-system/src/main/java/org/nl/wms/sch/ComPareUtil.java Normal file
View File

@@ -0,0 +1,76 @@
package org.nl.wms.sch;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.lang3.StringUtils;
import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService;
import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService;
import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
public class ComPareUtil {
public static JSONObject CompareWhight(JSONObject jsonObject) {
WQLObject subTab = WQLObject.getWQLObject("pdm_bi_subpackagerelation");
String vehicle_code = jsonObject.getString("vehicle_code");
// 处理子卷号
String material_barcode = jsonObject.getString("material_barcode");
if (ObjectUtil.isEmpty(material_barcode)) {
throw new BadRequestException("子卷号不能为空!");
}
List<String> pcsnList = Arrays.asList(material_barcode.split(","));
// 查询子卷包装关系
List<JSONObject> subList = subTab.query("container_name in ('" + String.join("','", pcsnList) + "') and status in ('0','1','99')")
.getResultJSONArray(0).toJavaList(JSONObject.class);
if (ObjectUtil.isEmpty(subList)) {
throw new BadRequestException("未查询到子卷包装信息!");
}
if (StringUtils.isBlank(subList.get(0).getString("package_box_sn"))) {
throw new BadRequestException("木箱号不能为空!");
}
//查询托盘重量
JSONObject vehicle_ext = WQLObject.getWQLObject("").query("storagevehicle_code = '" + vehicle_code + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(vehicle_ext)) {
throw new BadRequestException("未查询到托盘的扩展信息");
}
IpdmBiSubpackagerelationService ipdmBiSubpackagerelationService = SpringContextHolder.getBean(IpdmBiSubpackagerelationService.class);
List<PdmBiSubpackagerelation> list = ipdmBiSubpackagerelationService.list(new LambdaQueryWrapper<PdmBiSubpackagerelation>().eq(PdmBiSubpackagerelation::getPackage_box_sn, vehicle_ext.getString("pcsn")));
if (ObjectUtil.isEmpty(list)) {
throw new BadRequestException("未查询到对应的木箱包装关系！");
}
PdmBiSubpackagerelation sub = list.get(0);
double vehicle_weight = vehicle_ext.getDoubleValue("qty");
double current_weight = NumberUtil.sub(jsonObject.getDoubleValue("weight"), vehicle_weight);
double box_weight = sub.getBox_weight().doubleValue();
double weight_sys = Double.parseDouble(SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("weight_sys").getValue());
boolean compaer_result = true;
if (!(NumberUtil.sub(box_weight, weight_sys) <= current_weight && NumberUtil.add(box_weight, weight_sys) >= current_weight)) {
compaer_result = false;
}
JSONObject json = new JSONObject();
json.put("compaer_result", compaer_result);
json.put("box_no", sub.getPackage_box_sn());
return json;
}
}