|
|
|
@ -32,10 +32,8 @@ import org.nl.b_lms.sch.tasks.first_floor_area.GzqTask; |
|
|
|
import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; |
|
|
|
import org.nl.b_lms.sch.tasks.slitter.service.SlitterService; |
|
|
|
import org.nl.common.enums.PackageInfoIvtEnum; |
|
|
|
import org.nl.common.utils.SecurityUtils; |
|
|
|
import org.nl.common.utils.TaskUtils; |
|
|
|
import org.nl.common.utils.*; |
|
|
|
import org.nl.modules.common.exception.BadRequestException; |
|
|
|
import org.nl.common.utils.CodeUtil; |
|
|
|
import org.nl.modules.wql.WQL; |
|
|
|
import org.nl.modules.wql.core.bean.WQLObject; |
|
|
|
import org.nl.modules.wql.util.SpringContextHolder; |
|
|
|
@ -68,6 +66,7 @@ import javax.annotation.Resource; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.HashSet; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
@Service |
|
|
|
@ -565,10 +564,8 @@ public class MesToLmsServiceImpl implements MesToLmsService { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public JSONObject cutPlanTransfer(JSONObject param) { |
|
|
|
public Map cutPlanTransfer(JSONObject param) { |
|
|
|
log.info("cutPlanTransfer接口输入参数为：-------------------" + param.toString()); |
|
|
|
|
|
|
|
String orderType = param.getString("OrderType"); // 分切订单类型
|
|
|
|
String ContainerName = param.getString("ContainerName"); // 子卷号
|
|
|
|
String ProductName = param.getString("ProductName"); // 产品编码
|
|
|
|
@ -588,67 +585,24 @@ public class MesToLmsServiceImpl implements MesToLmsService { |
|
|
|
String Attribute4 = param.getString("Attribute4"); // 位置左右
|
|
|
|
String Attribute5 = param.getString("Attribute5"); // 是否套轴
|
|
|
|
String Attribute6 = param.getString("Attribute6"); // 是否套轴
|
|
|
|
|
|
|
|
WQLObject tab = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan"); |
|
|
|
|
|
|
|
JSONObject result = new JSONObject(); |
|
|
|
String parentContainerName = param.getString("ParentContainerName"); |
|
|
|
String restructContainerName = param.getString("RestructContainerName"); |
|
|
|
try { |
|
|
|
// 基础校验
|
|
|
|
if (ObjectUtil.isEmpty(orderType)) { |
|
|
|
throw new BadRequestException("分切订单类型不能为空"); |
|
|
|
} |
|
|
|
if (ObjectUtil.isEmpty(ContainerName)) { |
|
|
|
throw new BadRequestException("子卷号不能为空"); |
|
|
|
} |
|
|
|
if (ObjectUtil.isEmpty(ProductName)) { |
|
|
|
throw new BadRequestException("产品编码不能为空"); |
|
|
|
} |
|
|
|
if (ObjectUtil.isEmpty(Description)) { |
|
|
|
throw new BadRequestException("产品名称不能为空"); |
|
|
|
} |
|
|
|
if (ObjectUtil.isEmpty(Warehouse)) { |
|
|
|
throw new BadRequestException("来源卷位置不能为空"); |
|
|
|
} |
|
|
|
if (ObjectUtil.isEmpty(ResourceName)) { |
|
|
|
throw new BadRequestException("分切机台编码不能为空"); |
|
|
|
} |
|
|
|
if (ObjectUtil.isEmpty(SplitGroup)) { |
|
|
|
throw new BadRequestException("分切组不能为空"); |
|
|
|
} |
|
|
|
if (ObjectUtil.isEmpty(ManufactureSort)) { |
|
|
|
throw new BadRequestException("生产顺序不能为空"); |
|
|
|
} |
|
|
|
if (ObjectUtil.isEmpty(MfgOrderName)) { |
|
|
|
throw new BadRequestException("生产订单不能为空"); |
|
|
|
} |
|
|
|
if (ObjectUtil.isEmpty(ManufactureDate)) { |
|
|
|
throw new BadRequestException("生产日期不能为空"); |
|
|
|
} |
|
|
|
if (ObjectUtil.isEmpty(PaperTubeOrFRP)) { |
|
|
|
throw new BadRequestException("管件类型不能为空"); |
|
|
|
} |
|
|
|
if (ObjectUtil.isEmpty(SplitBreadth)) { |
|
|
|
throw new BadRequestException("子卷幅宽不能为空"); |
|
|
|
} |
|
|
|
if (ObjectUtil.isEmpty(SplitHeight)) { |
|
|
|
throw new BadRequestException("子卷理论长度不能为空"); |
|
|
|
} |
|
|
|
if (ObjectUtil.isEmpty(SplitWeight)) { |
|
|
|
throw new BadRequestException("子卷理论重量不能为空"); |
|
|
|
} |
|
|
|
|
|
|
|
AssertNullUtils.batch(MapOf.of( |
|
|
|
"orderType",orderType,"ContainerName",ContainerName,"ProductName",ProductName, |
|
|
|
"Description",Description,"Warehouse",Warehouse,"ResourceName",ResourceName |
|
|
|
,"SplitGroup",SplitGroup,"ManufactureSort",ManufactureSort,"MfgOrderName",MfgOrderName |
|
|
|
,"ManufactureDate",ManufactureDate,"PaperTubeOrFRP",PaperTubeOrFRP,"SplitBreadth",SplitBreadth |
|
|
|
,"SplitHeight",SplitHeight,"SplitWeight",SplitWeight)); |
|
|
|
/* orderType |
|
|
|
* 1.当订单类型为1（常规）时 ParentContainerName 来源母卷号不能为空 |
|
|
|
* 2.当订单类型为2（改制）时 RestructContainerName 改制来源子卷号、PackageBoxSN 子卷立库木箱号 不能为空 |
|
|
|
*/ |
|
|
|
if (StrUtil.equals(orderType, "1")) { |
|
|
|
if (ObjectUtil.isEmpty(param.getString("ParentContainerName"))) { |
|
|
|
throw new BadRequestException("来源母卷号不能为空"); |
|
|
|
} |
|
|
|
AssertNullUtils.batch(MapOf.of("parentContainerName", parentContainerName)); |
|
|
|
} else { |
|
|
|
if (ObjectUtil.isEmpty(param.getString("RestructContainerName"))) { |
|
|
|
throw new BadRequestException("改制来源子卷号不能为空"); |
|
|
|
} |
|
|
|
AssertNullUtils.batch(MapOf.of("restructContainerName", restructContainerName)); |
|
|
|
} |
|
|
|
/* PaperTubeOrFRP |
|
|
|
* 1.当管件类型为1（纸筒）时 PaperTubeMaterial 纸筒物料编码、PaperTubeDescription 纸筒物料描述、PaperTubeModel 纸筒规格 不能为空 |
|
|
|
@ -657,15 +611,10 @@ public class MesToLmsServiceImpl implements MesToLmsService { |
|
|
|
String qzz_generation = "0"; |
|
|
|
String qzz_size = "0"; |
|
|
|
if (StrUtil.equals(PaperTubeOrFRP, "1")) { |
|
|
|
if (ObjectUtil.isEmpty(param.getString("PaperTubeMaterial"))) { |
|
|
|
throw new BadRequestException("纸筒物料编码不能为空"); |
|
|
|
} |
|
|
|
if (ObjectUtil.isEmpty(param.getString("PaperTubeDescription"))) { |
|
|
|
throw new BadRequestException("纸筒物料描述不能为空"); |
|
|
|
} |
|
|
|
if (ObjectUtil.isEmpty(param.getString("PaperTubeModel"))) { |
|
|
|
throw new BadRequestException("纸筒规格不能为空"); |
|
|
|
} |
|
|
|
AssertNullUtils.batch(MapOf.of( |
|
|
|
"PaperTubeMaterial", param.getString("PaperTubeMaterial"), |
|
|
|
"PaperTubeDescription",param.getString("PaperTubeDescription"), |
|
|
|
"PaperTubeModel",param.getString("PaperTubeModel"))); |
|
|
|
if (param.getString("PaperTubeDescription").contains("3.12")) { |
|
|
|
qzz_generation = "4"; |
|
|
|
} else if (param.getString("PaperTubeDescription").contains("3.15")) { |
|
|
|
@ -673,21 +622,15 @@ public class MesToLmsServiceImpl implements MesToLmsService { |
|
|
|
} else { |
|
|
|
qzz_generation = "4"; |
|
|
|
} |
|
|
|
|
|
|
|
// 解析描述数组
|
|
|
|
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管物料编码不能为空"); |
|
|
|
} |
|
|
|
if (ObjectUtil.isEmpty(param.getString("FRPDescription"))) { |
|
|
|
throw new BadRequestException("FRP管物料描述不能为空"); |
|
|
|
} |
|
|
|
if (ObjectUtil.isEmpty(param.getString("FRPModel"))) { |
|
|
|
throw new BadRequestException("FRP管规格不能为空"); |
|
|
|
} |
|
|
|
AssertNullUtils.batch(MapOf.of( |
|
|
|
"FRPMaterial", param.getString("FRPMaterial"), |
|
|
|
"FRPDescription",param.getString("FRPDescription"), |
|
|
|
"FRP管规格不能为空",param.getString("FRP管规格不能为空"))); |
|
|
|
if (param.getString("FRPDescription").contains("3.12")) { |
|
|
|
qzz_generation = "4"; |
|
|
|
} else if (param.getString("FRPDescription").contains("3.15")) { |
|
|
|
@ -695,14 +638,13 @@ public class MesToLmsServiceImpl implements MesToLmsService { |
|
|
|
} else { |
|
|
|
qzz_generation = "4"; |
|
|
|
} |
|
|
|
|
|
|
|
// 解析描述数组
|
|
|
|
String[] tubeArray = param.getString("FRPDescription").split("\\|"); |
|
|
|
// 定义尺寸与长度
|
|
|
|
qzz_size = Character.toString(tubeArray[2].charAt(0)); |
|
|
|
} |
|
|
|
|
|
|
|
JSONObject json = new JSONObject(); |
|
|
|
packageDo:{ |
|
|
|
json.put("workorder_id", IdUtil.getSnowflake(1, 1).nextId()); |
|
|
|
json.put("order_type", orderType); |
|
|
|
json.put("container_name", ContainerName); |
|
|
|
@ -753,20 +695,14 @@ public class MesToLmsServiceImpl implements MesToLmsService { |
|
|
|
json.put("is_child_tz_ok", "0"); |
|
|
|
json.put("is_child_ps_ok", "0"); |
|
|
|
json.put("is_delete", "0"); |
|
|
|
tab.insert(json); |
|
|
|
|
|
|
|
result.put("RTYPE", "S"); |
|
|
|
result.put("RTMSG", "操作成功!"); |
|
|
|
result.put("RTOAL", 1); |
|
|
|
result.put("RTDAT", null); |
|
|
|
} |
|
|
|
PdmBiSlittingproductionplan slittingproductionplan = json.toJavaObject(PdmBiSlittingproductionplan.class); |
|
|
|
slittingproductionplanService.save(slittingproductionplan); |
|
|
|
return MapOf.of("RTYPE", "S","RTMSG", "操作成功!","RTOAL", 1,"RTDAT", null); |
|
|
|
} catch (Exception e) { |
|
|
|
result.put("RTYPE", "E"); |
|
|
|
result.put("RTMSG", "操作失败!" + e.getMessage()); |
|
|
|
result.put("RTOAL", 0); |
|
|
|
result.put("RTDAT", null); |
|
|
|
log.info("MES下发分切计划保存下发失败：-------------------" + e.getMessage()); |
|
|
|
return MapOf.of("RTYPE", "E","RTMSG", "操作失败!" + e.getMessage(),"RTOAL", 0,"RTDAT", null); |
|
|
|
} |
|
|
|
log.info("cutPlanTransfer接口输出参数为：-------------------" + result.toString()); |
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
|
zhangzq
7 months ago