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

rev:代码规范更新

Browse Source
This commit is contained in:
ludj
2023-12-13 10:16:35 +08:00
parent 10b0e6c2eb
commit 82a8540504
38 changed files with 219 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/ClassstandardServiceImpl.java
View File

@@ -102,7 +102,7 @@ public class ClassstandardServiceImpl implements ClassstandardService {
public void create(ClassstandardDto dto) {
String class_code = dto.getClass_code();
ClassstandardDto classstandardDto = this.findByCode(class_code);
if (classstandardDto != null && classstandardDto.getIs_delete().equals("0") ) {
if (classstandardDto != null && "0".equals(classstandardDto.getIs_delete()) ) {
throw new BadRequestException("存在相同的基础类别编号");
}
String currentUserId = SecurityUtils.getCurrentUserId();
@@ -142,7 +142,7 @@ public class ClassstandardServiceImpl implements ClassstandardService {
String class_code = dto.getClass_code();
ClassstandardDto classstandardDto = this.findByCode(class_code);
if (classstandardDto != null && !dto.getClass_id().equals(classstandardDto.getClass_id()) && classstandardDto.getIs_delete().equals("0") ) {
if (classstandardDto != null && !dto.getClass_id().equals(classstandardDto.getClass_id()) && "0".equals(classstandardDto.getIs_delete()) ) {
throw new BadRequestException("存在相同的供应商编号");
}
@@ -213,7 +213,7 @@ public class ClassstandardServiceImpl implements ClassstandardService {
if (!StrUtil.isEmpty(base_data_type)) {
where = "AND base_data_type = '" + base_data_type + "'";
}
if (pid == null || pid.equals("0")) {
if (pid == null || "0".equals(pid)) {
ja = WQLObject.getWQLObject("MD_PB_ClassStandard").query("(parent_class_id = '0' OR parent_class_id is null) and is_delete = '0' " + where + " order by class_id").getResultJSONArray(0);
} else {
ja = WQLObject.getWQLObject("MD_PB_ClassStandard").query("parent_class_id = '" + pid + "' AND is_delete = '0'" + where + " order by class_id").getResultJSONArray(0);
@@ -239,7 +239,7 @@ public class ClassstandardServiceImpl implements ClassstandardService {
@Override
public JSONArray getSuperior(JSONObject jo, JSONArray ja) {
WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard");
if (StrUtil.isEmpty(jo.getString("parent_class_id")) || jo.getString("parent_class_id").equals("0")) {
if (StrUtil.isEmpty(jo.getString("parent_class_id")) || "0".equals(jo.getString("parent_class_id"))) {
JSONArray null_pids = new JSONArray();
null_pids = wo.query("(parent_class_id = '0' OR parent_class_id is null) and is_delete = '0'").getResultJSONArray(0);
@@ -271,7 +271,7 @@ public class ClassstandardServiceImpl implements ClassstandardService {
for (int m = 0; m < ja.size(); m++) {
JSONObject jo1 = ja.getJSONObject(m);
isChild = false;
if (jo1.getString("parent_class_id").equals("0") || StrUtil.isEmpty(jo1.getString("parent_class_id"))) {
if ("0".equals(jo1.getString("parent_class_id")) || StrUtil.isEmpty(jo1.getString("parent_class_id"))) {
jo1.put("id", jo1.getString("class_id"));
jo1.put("label", jo1.getString("class_name"));
if (jo1.getInteger("sub_count") > 0) {
@@ -285,7 +285,7 @@ public class ClassstandardServiceImpl implements ClassstandardService {
}
for (int n = 0; n < ja.size(); n++) {
JSONObject jo2 = ja.getJSONObject(n);
if (!jo2.getString("class_id").equals("0") && jo1.getString("class_id").equals(jo2.getString("parent_class_id"))) {
if (!"0".equals(jo2.getString("class_id")) && jo1.getString("class_id").equals(jo2.getString("parent_class_id"))) {
isChild = true;
if (jo1.getJSONArray("children") == null) {
jo1.put("children", new JSONArray());
@@ -314,7 +314,7 @@ public class ClassstandardServiceImpl implements ClassstandardService {
jo1.put("leaf", true);
}
maters.add(jo1);
} else if (!jo1.getString("class_id").equals("0") && !mater_name.contains(jo1.getString("material_type_name"))) {
} else if (!"0".equals(jo1.getString("class_id")) && !mater_name.contains(jo1.getString("material_type_name"))) {
jo1.put("id", jo1.getString("class_id"));
jo1.put("label", jo1.getString("class_name"));
if (jo1.getInteger("sub_count") > 0) {
@@ -358,7 +358,7 @@ public class ClassstandardServiceImpl implements ClassstandardService {
ja = WQLObject.getWQLObject("MD_PB_ClassStandard").query("class_id = '" + classstandardDto.getClass_id() + "' order by class_id").getResultJSONArray(0);
} else if (StrUtil.isNotEmpty(where)) {
ja = WQLObject.getWQLObject("MD_PB_ClassStandard").query("1=1 " + where + " order by class_id").getResultJSONArray(0);
} else if (StrUtil.isEmpty(parent_class_code) || parent_class_code.equals("0")) {
} else if (StrUtil.isEmpty(parent_class_code) || "0".equals(parent_class_code)) {
ja = WQLObject.getWQLObject("MD_PB_ClassStandard").query("(parent_class_id = '0' OR parent_class_id is null) and is_delete = '0' order by class_id").getResultJSONArray(0);
}
for (int i = 0; i < ja.size(); i++) {

4
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/CustomerbaseServiceImpl.java
View File

@@ -88,7 +88,7 @@ public class CustomerbaseServiceImpl implements CustomerbaseService {
public void create(CustomerbaseDto dto) {
String cust_code = dto.getCust_code();
CustomerbaseDto customerbaseDto = this.findByCode(cust_code);
if (customerbaseDto != null && customerbaseDto.getIs_delete().equals("0")) {
if (customerbaseDto != null && "0".equals(customerbaseDto.getIs_delete())) {
throw new BadRequestException("存在相同的客户编号");
}
@@ -119,7 +119,7 @@ public class CustomerbaseServiceImpl implements CustomerbaseService {
String cust_code = dto.getCust_code();
CustomerbaseDto customerbaseDto = this.findByCode(cust_code);
if (customerbaseDto != null && !customerbaseDto.getCust_id().equals(dto.getCust_id()) && customerbaseDto.getIs_delete().equals("0")) {
if (customerbaseDto != null && !customerbaseDto.getCust_id().equals(dto.getCust_id()) && "0".equals(customerbaseDto.getIs_delete())) {
throw new BadRequestException("存在相同的客户编号");
}

2
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java
View File

@@ -227,7 +227,7 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
public void create(CustomerbaseDto dto) {
String cust_code = dto.getCust_code();
CustomerbaseDto customerbaseDto = this.findByCode(cust_code);
if (customerbaseDto != null && customerbaseDto.getIs_delete().equals("0")) {
if (customerbaseDto != null && "0".equals(customerbaseDto.getIs_delete())) {
throw new BadRequestException("存在相同的客户编号");
}

4
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SupplierbaseServiceImpl.java
View File

@@ -88,7 +88,7 @@ public class SupplierbaseServiceImpl implements SupplierbaseService {
public void create(SupplierbaseDto dto) {
String supp_code = dto.getSupp_code();
SupplierbaseDto supplierbaseDto = this.findByCode(supp_code);
if (supplierbaseDto != null && supplierbaseDto.getIs_delete().equals("0")) {
if (supplierbaseDto != null && "0".equals(supplierbaseDto.getIs_delete())) {
throw new BadRequestException("存在相同的供应商编号");
}
String currentUserId = SecurityUtils.getCurrentUserId();
@@ -128,7 +128,7 @@ public class SupplierbaseServiceImpl implements SupplierbaseService {
}
String supp_code = dto.getSupp_code();
SupplierbaseDto supplierbaseDto = this.findByCode(supp_code);
if (supplierbaseDto != null && !dto.getSupp_id().equals(supplierbaseDto.getSupp_id()) && supplierbaseDto.getIs_delete().equals("0")) {
if (supplierbaseDto != null && !dto.getSupp_id().equals(supplierbaseDto.getSupp_id()) && "0".equals(supplierbaseDto.getIs_delete())) {
throw new BadRequestException("存在相同的供应商编号");
}

4
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/UnitServiceImpl.java
View File

@@ -83,7 +83,7 @@ public class UnitServiceImpl implements UnitService {
public void create(UnitDto dto) {
String unit_code = dto.getUnit_code();
UnitDto unitDto = this.findByCode(unit_code);
if (unitDto != null && unitDto.getIs_delete().equals("0")) {
if (unitDto != null && "0".equals(unitDto.getIs_delete())) {
throw new BadRequestException("存在相同的编码");
}
@@ -116,7 +116,7 @@ public class UnitServiceImpl implements UnitService {
UnitDto unitDto = this.findByCode(unit_code);
if (unitDto != null &&
!unitDto.getMeasure_unit_id().equals(dto.getMeasure_unit_id())
&& unitDto.getIs_delete().equals("0")) {
&& "0".equals(unitDto.getIs_delete())) {
throw new BadRequestException("存在相同的编码");
}

4
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StorattrServiceImpl.java
View File

@@ -83,7 +83,7 @@ public class StorattrServiceImpl implements StorattrService {
public void create(StorattrDto dto) {
String stor_code = dto.getStor_code();
StorattrDto storattrDto = this.findByCode(stor_code);
if (storattrDto != null && storattrDto.getIs_delete().equals("0")) {
if (storattrDto != null && "0".equals(storattrDto.getIs_delete())) {
throw new BadRequestException("存在相同的仓库编号");
}
String currentUserId = SecurityUtils.getCurrentUserId();
@@ -116,7 +116,7 @@ public class StorattrServiceImpl implements StorattrService {
String stor_code = dto.getStor_code();
StorattrDto storattrDto = this.findByCode(stor_code);
if (storattrDto != null && !dto.getStor_id().equals(storattrDto.getStor_id()) && storattrDto.getIs_delete().equals("0")) {
if (storattrDto != null && !dto.getStor_id().equals(storattrDto.getStor_id()) && "0".equals(storattrDto.getIs_delete())) {
throw new BadRequestException("存在相同的供应商编号");
}

14
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java
View File

@@ -110,7 +110,7 @@ public class StructattrServiceImpl implements StructattrService {
public void create(StructattrDto dto) {
String struct_code = dto.getStruct_code();
StructattrDto structattrDto = this.findByCode(struct_code);
if (structattrDto != null && structattrDto.getIs_delete().equals("0")) {
if (structattrDto != null && "0".equals(structattrDto.getIs_delete())) {
throw new BadRequestException("存在相同的库区编号");
}
String currentUserId = SecurityUtils.getCurrentUserId();
@@ -169,7 +169,7 @@ public class StructattrServiceImpl implements StructattrService {
String struct_code = dto.getStruct_code();
StructattrDto structattrDto = this.findByCode(struct_code);
if (structattrDto != null && !dto.getStruct_id().equals(structattrDto.getStruct_id()) && structattrDto.getIs_delete().equals("0")) {
if (structattrDto != null && !dto.getStruct_id().equals(structattrDto.getStruct_id()) && "0".equals(structattrDto.getIs_delete())) {
throw new BadRequestException("存在相同的库区编号");
}
@@ -293,17 +293,17 @@ public class StructattrServiceImpl implements StructattrService {
JSONObject strInfo = attrTab
.query("struct_id = '" + struct_id + "'")
.uniqueResult(0);
if (strInfo.getString("is_used").equals("0")) {
if ("0".equals(strInfo.getString("is_used"))) {
// 被禁用
struct_status = 4;
} else if (strInfo.getString("sect_code").equals("PD01")) {
} else if ("PD01".equals(strInfo.getString("sect_code"))) {
// 盘点位
struct_status = 5;
} else if (ObjectUtil.isEmpty(strInfo.getString("storagevehicle_code"))) {
// 空位
struct_status = 3;
} else if (ObjectUtil.isNotEmpty(strInfo.getString("storagevehicle_code"))
&& strInfo.getString("sect_code").equals("KTP01")) {
&& "KTP01".equals(strInfo.getString("sect_code"))) {
struct_status = 1;
}
// 剩余层数货位信息没统计，统计可以用obj.put(key, value)返给前端，前端在initStatus()就可以遍历去获取，给节点赋值
@@ -388,7 +388,7 @@ public class StructattrServiceImpl implements StructattrService {
JSONArray sub_rows = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '"+whereJson.getString("vehicle_code")+"'").getResultJSONArray(0);
for (int i = 0; i < sub_rows.size(); i++) {
JSONObject sub_row = sub_rows.getJSONObject(i);
if (StrUtil.isNotEmpty(sub_row.getString("need_delete")) && sub_row.getString("need_delete").equals("1")){
if (StrUtil.isNotEmpty(sub_row.getString("need_delete")) && "1".equals(sub_row.getString("need_delete"))){
WQLObject.getWQLObject("pdm_bi_subpackagerelation").delete(sub_row);
}
}
@@ -398,7 +398,7 @@ public class StructattrServiceImpl implements StructattrService {
JSONArray sub_rows2 = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '"+jsonPoint2.getString("vehicle_code")+"'").getResultJSONArray(0);
for (int i = 0; i < sub_rows2.size(); i++) {
JSONObject sub_row = sub_rows2.getJSONObject(i);
if (StrUtil.isNotEmpty(sub_row.getString("need_delete")) && sub_row.getString("need_delete").equals("1")){
if (StrUtil.isNotEmpty(sub_row.getString("need_delete")) && "1".equals(sub_row.getString("need_delete"))){
WQLObject.getWQLObject("pdm_bi_subpackagerelation").delete(sub_row);
}
}

6
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
View File

@@ -300,11 +300,11 @@ public class StructivtServiceImpl implements StructivtService {
mp.put("子卷的物性值1", json.getString("un_plan_product_property1"));
mp.put("子卷的物性值2", json.getString("un_plan_product_property2"));
mp.put("子卷的物性值3", json.getString("un_plan_product_property3"));
if (json.getString("remark").equals("1")) {
if ("1".equals(json.getString("remark"))) {
mp.put("超期原因", "客户原因");
} else if (json.getString("remark").equals("2")) {
} else if ("2".equals(json.getString("remark"))) {
mp.put("超期原因", "生产质量原因");
} else if (json.getString("remark").equals("3")){
} else if ("3".equals(json.getString("remark"))){
mp.put("超期原因", "市场原因");
} else {
mp.put("超期原因", "");

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

@@ -129,7 +129,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
log.info("输入参数：" + task_id);
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonTask)) throw new BadRequestException("任务已删除或已完成！");
if (ObjectUtil.isEmpty(jsonTask)) {
throw new BadRequestException("任务已删除或已完成！");
}
String point_code = "";
String message = "";
@@ -190,8 +192,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
WQLObject point_table = WQLObject.getWQLObject("SCH_BASE_Point");
WQLObject struct_table = WQLObject.getWQLObject("ST_IVT_StructAttr");
if (ObjectUtil.isEmpty(type)) throw new BadRequestException("ACS申请任务失败！任务类型不能为空");
if (ObjectUtil.isEmpty(device_code)) throw new BadRequestException("ACS申请任务失败！点位不能为空");
if (ObjectUtil.isEmpty(type)) {
throw new BadRequestException("ACS申请任务失败！任务类型不能为空");
}
if (ObjectUtil.isEmpty(device_code)) {
throw new BadRequestException("ACS申请任务失败！点位不能为空");
}
/*
* 根据type判断是什么业务类型：
@@ -200,11 +206,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
* 3.空盘出库任务
* 4.出库口申请入发货区任务
*/
if (type.equals("1")) {
if ("1".equals(type)) {
boolean checked = true;
boolean auto_div = false;
if (ObjectUtil.isEmpty(vehicle_code)) throw new BadRequestException("ACS申请任务失败！载具不能为空");
if (ObjectUtil.isEmpty(vehicle_code)) {
throw new BadRequestException("ACS申请任务失败！载具不能为空");
}
//通过该木箱码查询对应的分配明细
JSONArray dis_rows = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParam("box_no", vehicle_code).addParam("flag", "28").process().getResultJSONArray(0);
@@ -269,7 +277,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
//自动分配货位并下发任务
rawAssistIStorService.divStruct(map);
}
if (type.equals("2")) {
if ("2".equals(type)) {
//查询一个可用的空载具点位并下发给ACS
/*
* 1、优先存放空托盘区、托盘号默认99999；空托盘区没有位置，再找空巷道，或者空巷道有空位置的货位。
@@ -293,11 +301,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (ObjectUtil.isEmpty(isLock)) {
if (placement_type.equals("03")) {
if ("03".equals(placement_type)) {
// 右通
struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type = '1' AND block_num = '" + block_num + "'AND placement_type = '" + placement_type + "' AND row_num = '" + row_num + "' AND is_delete = '0' AND is_used = '1' AND IFNULL(storagevehicle_code,'') = '' order by out_order_seq desc").uniqueResult(0);
break;
} else if (placement_type.equals("02")) {
} else if ("02".equals(placement_type)) {
// 左通
struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type = '1' AND block_num = '" + block_num + "'AND placement_type = '" + placement_type + "' AND row_num = '" + row_num + "' AND is_delete = '0' AND is_used = '1' AND IFNULL(storagevehicle_code,'') = '' order by out_order_seq").uniqueResult(0);
break;
@@ -360,7 +368,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
point_table.update(map, "point_code = '" + struct_jo.getString("struct_code") + "'");
struct_table.update(map, "struct_code = '" + struct_jo.getString("struct_code") + "'");
}
if (type.equals("3")) {
if ("3".equals(type)) {
//查询一个可用的空载具点位并下发给ACS
/*
* 1、优先存放空托盘区、托盘号默认99999；空托盘区没有位置，再找空巷道，或者空巷道有空位置的货位。
@@ -395,7 +403,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
JSONArray isLock = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type in ('4','5') AND block_num = '" + block_num + "'AND placement_type = '" + placement_type + "' AND row_num = '" + row_num + "' AND is_delete = '0' AND is_used = '1'").getResultJSONArray(0);
if (ObjectUtil.isEmpty(isLock)) {
if (placement_type.equals("01") || placement_type.equals("03")) {
if ("01".equals(placement_type) || "03".equals(placement_type)) {
struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type = '1' AND block_num = '" + block_num + "'AND placement_type = '" + placement_type + "' AND row_num = '" + row_num + "' AND is_delete = '0' AND is_used = '1' AND IFNULL(storagevehicle_code,'') <> '' order by out_order_seq").uniqueResult(0);
break;
} else {
@@ -427,7 +435,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
}
if (type.equals("4")) {
if ("4".equals(type)) {
CutConveyorTask cutConveyorTask = new CutConveyorTask();
//查询该木箱对应的包装关系
@@ -632,7 +640,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
try {
if (tryLock) {
if (type.equals("1")) {
if ("1".equals(type)) {
//贴标申请
if (StrUtil.isEmpty(vehicle_code)) {
throw new BadRequestException("木箱码不能为空！");
@@ -705,7 +713,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
result.put("message", "标签纸数量过低，请更换!");
}
result.put("data", data);
} else if (type.equals("2")) {
} else if ("2".equals(type)) {
//捆扎申请
if (StrUtil.isEmpty(vehicle_code)) {
@@ -769,7 +777,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
result.put("data", data);
} else if (type.equals("3")) {
} else if ("3".equals(type)) {
//判断AGV是否启用
String device_code = whereJson.getString("device_code");
String product_area = device_code.substring(0, 2);
@@ -908,7 +916,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
map.put("error", whereJson.getString("error"));
map.put("error_msg", whereJson.getString("error_msg"));
map.put("error_update_time", DateUtil.now());
if (whereJson.getString("error").equals("0")){
if ("0".equals(whereJson.getString("error"))){
map.put("is_upload", "0");
map.put("upload_time", DateUtil.now());
}
@@ -974,7 +982,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
.addParam("sort_seq", sort_seq)
.addParam("find_type", "1")
.addParam("flag", "17").process().uniqueResult(0);
if (ObjectUtil.isNotEmpty(right_point) && !right_point.getString("point_status").equals("01")) {
if (ObjectUtil.isNotEmpty(right_point) && !"01".equals(right_point.getString("point_status"))) {
//创建载具横移任务
String translate_code1 = right_point.getString("point_code");
String translate_code2 = device_code;

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

@@ -64,7 +64,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
log.info("momRollFoilWeighing接口输出参数为：-------------------" + result.toString());
String RTYPE = result.getString("RTYPE");
if (RTYPE.equals("E")) {
if ("E".equals(RTYPE)) {
throw new BadRequestException(result.getString("RTMSG"));
}
@@ -126,7 +126,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
log.info("momRollBakeInBound接口输出参数为：-------------------" + result.toString());
String RTYPE = result.getString("RTYPE");
if (RTYPE.equals("E")) {
if ("E".equals(RTYPE)) {
throw new BadRequestException(result.getString("RTMSG"));
}
} catch (Exception e) {
@@ -190,7 +190,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
log.info("momRollBakeOutBound接口输出参数为：-------------------" + result.toString());
String RTYPE = result.getString("RTYPE");
if (RTYPE.equals("E")) {
if ("E".equals(RTYPE)) {
throw new BadRequestException(result.getString("RTMSG"));
}
@@ -234,7 +234,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
String RTYPE = result.getString("RTYPE");
if (RTYPE.equals("E")) {
if ("E".equals(RTYPE)) {
throw new BadRequestException(result.getString("RTMSG"));
}
@@ -288,7 +288,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
log.info("airSwellWithPaperTubeAssComplete接口输出参数为：-------------------" + result.toString());
String RTYPE = result.getString("RTYPE");
if (RTYPE.equals("E")) {
if ("E".equals(RTYPE)) {
throw new BadRequestException(result.getString("RTMSG"));
}
@@ -348,7 +348,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
String RTYPE = result.getString("RTYPE");
if (RTYPE.equals("E")) {
if ("E".equals(RTYPE)) {
throw new BadRequestException(result.getString("RTMSG"));
}
@@ -399,7 +399,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
String RTYPE = result.getString("RTYPE");
if (RTYPE.equals("E")) {
if ("E".equals(RTYPE)) {
throw new BadRequestException(result.getString("RTMSG"));
}
@@ -455,7 +455,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
String RTYPE = result.getString("RTYPE");
if (RTYPE.equals("E")) {
if ("E".equals(RTYPE)) {
throw new BadRequestException(result.getString("RTMSG"));
}
@@ -498,7 +498,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
String RTYPE = result.getString("RTYPE");
if (RTYPE.equals("E")) {
if ("E".equals(RTYPE)) {
throw new BadRequestException(result.getString("RTMSG"));
}
@@ -546,7 +546,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
String RTYPE = result.getString("RTYPE");
if (RTYPE.equals("E")) {
if ("E".equals(RTYPE)) {
throw new BadRequestException(result.getString("RTMSG"));
}
@@ -594,7 +594,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
String RTYPE = result.getString("RTYPE");
if (RTYPE.equals("E")) {
if ("E".equals(RTYPE)) {
throw new BadRequestException(result.getString("RTMSG"));
}
@@ -631,7 +631,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
String RTYPE = result.getString("RTYPE");
if (RTYPE.equals("E")) {
if ("E".equals(RTYPE)) {
throw new BadRequestException(result.getString("RTMSG"));
}
@@ -668,7 +668,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
String RTYPE = result.getString("RTYPE");
if (RTYPE.equals("E")) {
if ("E".equals(RTYPE)) {
throw new BadRequestException(result.getString("RTMSG"));
}

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

@@ -366,7 +366,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
String product_area = ContainerName.substring(0,2);
String agv_status = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode(product_area+"_agv_status").getValue();
if (agv_status.equals("1")) {
if ("1".equals(agv_status)) {
log.info("当前AGV启用参数为是");
JSONObject jsonPoint = pointTab.query("material_code = '" + containerName + "' and is_delete = '0' and is_used = '1'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonPoint)) {
@@ -403,7 +403,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
//判断该接口是否需要回传
JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollSemiFGInboundComplete'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")) {
if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) {
new LmsToMesServiceImpl().momRollSemiFGInboundComplete(param);
}
@@ -631,7 +631,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(plan_jo);
}
if (StrUtil.equals(is_mesTolms, "1")) {
if (Attribute1.equals("0")) {
if ("0".equals(Attribute1)) {
result.put("RTYPE", "S");
result.put("RTMSG", "操作成功!");
result.put("RTOAL", 1);
@@ -643,12 +643,12 @@ public class MesToLmsServiceImpl implements MesToLmsService {
//查询该分切机对应的点位
JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("ext_code = '" + plan_jo.getString("resource_name") + "'").uniqueResult(0);
if (StrUtil.isNotEmpty(cut_jo.getString("container_name")) || cut_jo.getString("full_point_status").equals("02")) {
if (StrUtil.isNotEmpty(cut_jo.getString("container_name")) || "02".equals(cut_jo.getString("full_point_status"))) {
throw new BadRequestException("该分切机对应的上料位存在母卷，不能下发搬运任务！");
}
//创建搬运任务
if (plan_jo.getString("order_type").equals("1")) {
if ("1".equals(plan_jo.getString("order_type"))) {
//生成一个半成品出库任务
String parent_container_name = plan_jo.getString("parent_container_name");
@@ -734,7 +734,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
if (ObjectUtil.isEmpty(struct)) {
throw new BadRequestException("该箱子已出库，不在库内！");
}
if (!struct.getString("lock_type").equals("1")) {
if (!"1".equals(struct.getString("lock_type"))) {
throw new BadRequestException("该木箱正在出库中！");
}
@@ -816,7 +816,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
throw new BadRequestException("分切计划对应的分切机不存在：" + ResourceName);
}
if ("0".equals(cut_jo.getString("is_used"))) {
if (Status.equals("1")) {
if ("1".equals(Status)) {
for (int i = 0; i < param.size(); i++) {
JSONObject row = param.getJSONObject(i);
JSONObject plan_jo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("container_name = '" + row.getString("ContainerGroup") + "' AND is_delete = '0'").uniqueResult(0);
@@ -855,7 +855,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
result.put("RTDAT", null);
return result;
}
if (Status.equals("1")) {
if ("1".equals(Status)) {
//更新分切计划表状态
for (int i = 0; i < param.size(); i++) {
JSONObject row = param.getJSONObject(i);
@@ -866,7 +866,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
//查询当前子卷号状态
String now_status = plan_jo.getString("status");
if (!now_status.equals("05")) {
if (!"05".equals(now_status)) {
log.info("子卷号：" + row.getString("ContainerGroup") + "当前状态为：" + now_status + "，被MES的开始分切接口改为入站完成！");
}
//如果入站的分切计划气涨轴为空，则虚拟一个气a涨轴编号
@@ -886,7 +886,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
}
}
if (Status.equals("2")) {
if ("2".equals(Status)) {
String up_point_code = cut_jo.getString("up_point_code");
String down_point_code = cut_jo.getString("down_point_code");
@@ -911,7 +911,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
WQLObject.getWQLObject("pdm_bi_slittingproductionplan").update(plan_jo);
log.info("子卷号：" + row.getString("ContainerGroup") + "MES上选择了不需要下卷，不生成任务！");
} else {
if (row.getString("ContainerPosition").equals("1")) {
if ("1".equals(row.getString("ContainerPosition"))) {
if (StrUtil.isEmpty(up_qzz)) {
up_qzz = qzzno;
up_rows.add(plan_jo);
@@ -924,7 +924,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
}
}
}
if (row.getString("ContainerPosition").equals("2")) {
if ("2".equals(row.getString("ContainerPosition"))) {
if (StrUtil.isEmpty(down_qzz)) {
if (StrUtil.isEmpty(up_qzz)) {
down_qzz = qzzno;
@@ -1090,7 +1090,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
String standard_limit = detail.getString("Attribute5");//内控标准抗拉下限
String actual_value = detail.getString("Attribute6");//生产实际抗拉值
String Attribute7 = detail.getString("7");//生产实际抗拉值
if (ObjectUtil.isNotEmpty(Attribute7) && Attribute7.equals("1")){
if (ObjectUtil.isNotEmpty(Attribute7) && "1".equals(Attribute7)){
sub_type = "2";
}
@@ -1119,7 +1119,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
}
jo.put("box_weight", BoxWeight);
if (QualityGuaranPeriod.equals("0天")) {
if ("0天".equals(QualityGuaranPeriod)) {
jo.put("quality_guaran_period", "90天");
} else {
jo.put("quality_guaran_period", QualityGuaranPeriod);
@@ -1353,7 +1353,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
String SaleOrderName = param.getString("SaleOrderName");
String isUnPlanProduction = param.getString("isUnPlanProduction");
String sale_order_description = param.getString("Attribute1");
if (isUnPlanProduction.equals("1")) {
if ("1".equals(isUnPlanProduction)) {
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
@@ -1468,7 +1468,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
// 调用接口
ProductScrapServiceImpl bean = SpringContextHolder.getBean(ProductScrapServiceImpl.class);
if (result.equals("0")) {
if ("0".equals(result)) {
bean.auditOut(json);
} else {
bean.auditPass(json);

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
View File

@@ -96,7 +96,7 @@ public class BakingServiceImpl implements BakingService {
throw new BadRequestException("未查询到母卷号：" + container_name + "对应的生箔机台编号！");
}
if (StrUtil.equals("1", sb_jo.getString("mes_used")) && !raw_jo.getString("is_baking").equals("1")) {
if (StrUtil.equals("1", sb_jo.getString("mes_used")) && !"1".equals(raw_jo.getString("is_baking"))) {
throw new BadRequestException("该母卷在MES上未进行决策入烘箱，不允许进行入烘箱操作！");
}
@@ -471,7 +471,7 @@ public class BakingServiceImpl implements BakingService {
throw new BadRequestException("未查询到母卷号：" + container_name + "对应的生箔机台编号！");
}
if (StrUtil.equals("1", sb_jo.getString("mes_used")) && !raw_jo.getString("is_instor").equals("1")) {
if (StrUtil.equals("1", sb_jo.getString("mes_used")) && !"1".equals(raw_jo.getString("is_instor"))) {
throw new BadRequestException("该母卷在MES上未进行决策入半成品库，不允许进行入冷却操作！");
}

22
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/CasingServiceImpl.java
View File

@@ -95,7 +95,7 @@ public class CasingServiceImpl implements CasingService {
split_group = row.getString("split_group");
resource_name = row.getString("resource_name");
order_type = row.getString("order_type");
if (order_type.equals("1")) {
if ("1".equals(order_type)) {
parent_container_name = row.getString("parent_container_name");
} else {
restruct_container_name = row.getString("restruct_container_name");
@@ -108,7 +108,7 @@ public class CasingServiceImpl implements CasingService {
if (!resource_name.equals(row.getString("resource_name"))) {
throw new BadRequestException("两个分切计划的机台编号必须相同！");
}
if (order_type.equals("1")) {
if ("1".equals(order_type)) {
if (!parent_container_name.equals(row.getString("parent_container_name"))) {
throw new BadRequestException("两个分切计划的母卷号必须相同！");
}
@@ -130,7 +130,7 @@ public class CasingServiceImpl implements CasingService {
if (!resource_name.equals(row.getString("resource_name"))) {
throw new BadRequestException("该气涨轴上绑定的分切计划与当前所选分切计划机台编号不同！");
}
if (order_type.equals("1")) {
if ("1".equals(order_type)) {
if (!parent_container_name.equals(row.getString("parent_container_name"))) {
throw new BadRequestException("该气涨轴上绑定的分切计划与当前所选分切计划母卷号不同！");
}
@@ -145,7 +145,7 @@ public class CasingServiceImpl implements CasingService {
}
//如果一个分切组只有两个子卷，则一定得分两根轴进行绑定
if ((rows.size() == 2 || (rows.size() == 1 && case_rows.size() == 1)) && order_type.equals("1")) {
if ((rows.size() == 2 || (rows.size() == 1 && case_rows.size() == 1)) && "1".equals(order_type)) {
JSONArray group_rows = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("parent_container_name = '" + parent_container_name + "' AND split_group = '" + split_group + "' AND is_delete = '0'").getResultJSONArray(0);
if (group_rows.size() == 2) {
throw new BadRequestException("该分切组只有两个分切计划，请选择两个不同的轴进行绑定！");
@@ -170,7 +170,7 @@ public class CasingServiceImpl implements CasingService {
jo.put("container_name", row.getString("container_name"));
//判断该接口是否需要回传
JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'airSwellWithPaperTubeAssComplete'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")) {
if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) {
lmsToMesService.airSwellWithPaperTubeAssComplete(jo);
}
@@ -201,15 +201,15 @@ public class CasingServiceImpl implements CasingService {
if (ObjectUtil.isEmpty(qzz_jo)) {
throw new BadRequestException("该气涨轴不存在或被删除！");
}
if (qzz_jo.getString("is_used").equals("0")) {
if ("0".equals(qzz_jo.getString("is_used"))) {
throw new BadRequestException("气涨轴未启用！");
}
String storagevehicle_type = qzz_jo.getString("storagevehicle_type");
String to_size = "";
if (storagevehicle_type.equals("000101")) {
if ("000101".equals(storagevehicle_type)) {
to_size = "3";
}
if (storagevehicle_type.equals("000102")) {
if ("000102".equals(storagevehicle_type)) {
to_size = "6";
}
if (StrUtil.isEmpty(to_size)) {
@@ -249,15 +249,15 @@ public class CasingServiceImpl implements CasingService {
if (ObjectUtil.isEmpty(qzz_jo)) {
throw new BadRequestException("该气涨轴不存在或被删除！");
}
if (qzz_jo.getString("is_used").equals("0")) {
if ("0".equals(qzz_jo.getString("is_used"))) {
throw new BadRequestException("气涨轴未启用！");
}
String storagevehicle_type = qzz_jo.getString("storagevehicle_type");
String to_size = "";
if (storagevehicle_type.equals("000101")) {
if ("000101".equals(storagevehicle_type)) {
to_size = "3";
}
if (storagevehicle_type.equals("000102")) {
if ("000102".equals(storagevehicle_type)) {
to_size = "6";
}
if (StrUtil.isEmpty(to_size)) {

6
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/EmptyVehicleServiceImpl.java
View File

@@ -54,13 +54,13 @@ public class EmptyVehicleServiceImpl implements EmptyVehicleService {
if (ObjectUtil.isEmpty(point_jo)) {
throw new BadRequestException("空轴点位不存在！");
}
if (option.equals("0")) {
if ("0".equals(option)) {
point_jo.put("empty_vehicle_code", "");
point_jo.put("empty_point_status", "01");
}
if (option.equals("1")) {
if ("1".equals(option)) {
//绑定的时候判断点位上是否存在母卷存在母卷不允许进行绑定
if (point_jo.getString("full_point_status").equals("02")) {
if ("02".equals(point_jo.getString("full_point_status"))) {
throw new BadRequestException("该点位上存在母卷，不能进行绑定空轴！");
}
CutConveyorTask cutConveyorTask = SpringContextHolder.getBean(CutConveyorTask.class);

8
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
View File

@@ -83,12 +83,12 @@ public class FeedingServiceImpl implements FeedingService {
//查询该分切机对应的点位
JSONObject cut_jo = WQLObject.getWQLObject("st_ivt_cutpointivt").query("ext_code = '" + plan_jo.getString("resource_name") + "'").uniqueResult(0);
if (StrUtil.isNotEmpty(cut_jo.getString("container_name")) || cut_jo.getString("full_point_status").equals("02")) {
if (StrUtil.isNotEmpty(cut_jo.getString("container_name")) || "02".equals(cut_jo.getString("full_point_status"))) {
throw new BadRequestException("该分切机对应的上料位存在母卷，不能下发搬运任务！");
}
//创建搬运任务
if (plan_jo.getString("order_type").equals("1")) {
if ("1".equals(plan_jo.getString("order_type"))) {
//生成一个半成品出库任务
String parent_container_name = plan_jo.getString("parent_container_name");
@@ -174,7 +174,7 @@ public class FeedingServiceImpl implements FeedingService {
if (ObjectUtil.isEmpty(struct)) {
throw new BadRequestException("该箱子已出库，不在库内！");
}
if (!struct.getString("lock_type").equals("3")) {
if (!"3".equals(struct.getString("lock_type"))) {
throw new BadRequestException("该木箱正在出库中！");
}
@@ -287,7 +287,7 @@ public class FeedingServiceImpl implements FeedingService {
throw new BadRequestException("请扫描或者输入分切区域的满轴点位做为终点！");
}
if (StrUtil.isNotEmpty(cut_jo.getString("container_name")) || cut_jo.getString("full_point_status").equals("02")) {
if (StrUtil.isNotEmpty(cut_jo.getString("container_name")) || "02".equals(cut_jo.getString("full_point_status"))) {
throw new BadRequestException("该分切机对应的上料位存在母卷，不能下发搬运任务！");
}

8
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/HandleBakingServiceImpl.java
View File

@@ -182,7 +182,7 @@ public class HandleBakingServiceImpl implements HandleBakingService {
//判断该接口是否需要回传
JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollBakeInBound'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")) {
if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) {
new LmsToMesServiceImpl().momRollBakeInBound(param);
}
@@ -258,7 +258,7 @@ public class HandleBakingServiceImpl implements HandleBakingService {
if (StrUtil.equals(jsonIvt.getString("empty_point_status"),"02")) {
throw new BadRequestException("目的点上存在空轴！");
}
if (jsonIvt.getString("is_used").equals("0")){
if ("0".equals(jsonIvt.getString("is_used"))){
throw new BadRequestException("当前点位未启用！");
}
jsonIvt.put("full_point_status", "02");
@@ -282,7 +282,7 @@ public class HandleBakingServiceImpl implements HandleBakingService {
//判断该接口是否需要回传
JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollBakeOutBound'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")) {
if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) {
new LmsToMesServiceImpl().momRollBakeOutBound(param);
}
}
@@ -329,7 +329,7 @@ public class HandleBakingServiceImpl implements HandleBakingService {
//判断该接口是否需要回传
JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollSemiFGInboundComplete'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")){
if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))){
new LmsToMesServiceImpl().momRollSemiFGInboundComplete(param);
}

6
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java
View File

@@ -86,7 +86,7 @@ public class OutServiceImpl implements OutService {
split_group = row.getString("split_group");
resource_name = row.getString("resource_name");
order_type = row.getString("order_type");
if (order_type.equals("1")) {
if ("1".equals(order_type)) {
parent_container_name = row.getString("parent_container_name");
} else {
restruct_container_name = row.getString("restruct_container_name");
@@ -99,7 +99,7 @@ public class OutServiceImpl implements OutService {
if (!resource_name.equals(row.getString("resource_name"))) {
throw new BadRequestException("两个子卷的机台编号必须相同！");
}
if (order_type.equals("1")) {
if ("1".equals(order_type)) {
if (!parent_container_name.equals(row.getString("parent_container_name"))) {
throw new BadRequestException("两个子卷的母卷号必须相同！");
}
@@ -125,7 +125,7 @@ public class OutServiceImpl implements OutService {
String cut_qzzno = rows.getJSONObject(0).getString("qzzno");
//判断是否末次下卷
if (is_last.equals("1")) {
if ("1".equals(is_last)) {
//查询该分切机邻近位置的空载具的输送线点位
JSONObject empty_vehicle = WQL.getWO("PDA_02")
.addParam("sort_seq", cut_ivt.getString("sort_seq"))

8
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PointStatusServiceImpl.java
View File

@@ -31,7 +31,7 @@ public class PointStatusServiceImpl implements PointStatusService {
String option = whereJson.getString("option");
//1-绑定
if (option.equals("1")) {
if ("1".equals(option)) {
String container_name = whereJson.getString("container_name");
if (StrUtil.isEmpty(container_name)) {
throw new BadRequestException("空轴/母卷不能为空！");
@@ -101,13 +101,13 @@ public class PointStatusServiceImpl implements PointStatusService {
mom_jo.put("warehouse", "1");
//判断该接口是否需要回传
JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollSemiFGInboundComplete'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")) {
if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) {
lmsToMesService.cutPlanMomRollDeliveryComplete(mom_jo);
}
}
}
//2-解绑
if (option.equals("2")) {
if ("2".equals(option)) {
//查询该点对应的是什么位置
JSONObject cut_point = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("full_point_code = '" + point_code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(cut_point)) {
@@ -174,7 +174,7 @@ public class PointStatusServiceImpl implements PointStatusService {
}
JSONObject jo = new JSONObject();
jo.put("container_name", vehicle_code);
if (have_goods.equals("01")) {
if ("01".equals(have_goods)) {
have_goods = "否";
} else {
have_goods = "是";

22
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java
View File

@@ -126,7 +126,7 @@ public class ShippingServiceImpl implements ShippingService {
split_group = row.getString("split_group");
resource_name = row.getString("resource_name");
order_type = row.getString("order_type");
if (order_type.equals("1")) {
if ("1".equals(order_type)) {
parent_container_name = row.getString("parent_container_name");
} else {
restruct_container_name = row.getString("restruct_container_name");
@@ -139,7 +139,7 @@ public class ShippingServiceImpl implements ShippingService {
if (!resource_name.equals(row.getString("resource_name"))) {
throw new BadRequestException("两个分切计划的机台编号必须相同！");
}
if (order_type.equals("1")) {
if ("1".equals(order_type)) {
if (!parent_container_name.equals(row.getString("parent_container_name"))) {
throw new BadRequestException("两个分切计划的母卷号必须相同！");
}
@@ -192,10 +192,10 @@ public class ShippingServiceImpl implements ShippingService {
JSONArray cut_rows = WQL.getWO("PDA_02").addParam("flag", "13").addParam("qzzno", qzzno).addParam("product_area", product_area).addParam("point_location", point_location).process().getResultJSONArray(0);
if (cut_rows.size() > 3) {
if (point_location.equals("0")) {
if ("0".equals(point_location)) {
throw new BadRequestException("已超过上半段输送线最大负荷任务数，请等下一子卷送出再进行配送，并将该空载具送回！");
}
if (point_location.equals("1")) {
if ("1".equals(point_location)) {
throw new BadRequestException("已超过下半段输送线最大负荷任务数，请等下一子卷送出再进行配送，并将该空载具送回！");
}
}
@@ -234,7 +234,7 @@ public class ShippingServiceImpl implements ShippingService {
JSONObject right_point = WQLObject.getWQLObject("st_ivt_deliverypointivt").query("point_location = '" + empty_point.getString("point_location") + "' AND product_area = '" + empty_point.getString("product_area") + "' AND sort_seq = '" + empty_point.getString("sort_seq") + "' order by point_code desc").uniqueResult(0);
//判断是否存在任务
JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("(point_code1 = '" + right_point.getString("point_code") + "' OR point_code2 = '" + right_point.getString("point_code") + "') AND task_status < '07' AND is_delete = '0' AND task_type = '010402'").uniqueResult(0);
if (!right_point.getString("point_status").equals("01")) {
if (!"01".equals(right_point.getString("point_status"))) {
throw new BadRequestException(empty_point.getString("point_code") + "所在一截输送线缓存位存在货物，请使用【载具横移】功能将货物横移！");
}
if (ObjectUtil.isNotEmpty(task_jo)) {
@@ -265,7 +265,7 @@ public class ShippingServiceImpl implements ShippingService {
//如果是右边的任务，判断左边是否存在空载具且没任务，如果存在则把左边的空载具送出
JSONObject left_point = WQLObject.getWQLObject("st_ivt_deliverypointivt").query("point_location = '" + empty_point.getString("point_location") + "' AND product_area = '" + empty_point.getString("product_area") + "' AND sort_seq = '" + empty_point.getString("sort_seq") + "' order by point_code").uniqueResult(0);
JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("(point_code1 = '" + left_point.getString("point_code") + "' OR point_code2 = '" + left_point.getString("point_code") + "') AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isEmpty(task_jo) && left_point.getString("point_status").equals("02")) {
if (ObjectUtil.isEmpty(task_jo) && "02".equals(left_point.getString("point_status"))) {
//如果查询到给ACS下发一个输送线任务
JSONObject form2 = new JSONObject();
form2.put("point_code1", left_point.getString("point_code"));
@@ -312,7 +312,7 @@ public class ShippingServiceImpl implements ShippingService {
if (ObjectUtil.isEmpty(start_jo)) {
throw new BadRequestException("未查询到对应点位！");
}
if (!start_jo.getString("point_type").equals("6")) {
if (!"6".equals(start_jo.getString("point_type"))) {
throw new BadRequestException("请选择输送线入库口作为起点！");
}
@@ -341,7 +341,7 @@ public class ShippingServiceImpl implements ShippingService {
if (ObjectUtil.isNotEmpty(task_jo)) {
throw new BadRequestException(point_jo.getString("point_code") + "所在一截输送线存在未完成的任务，请稍等几分钟后进行下发！");
}
if (!right_point.getString("point_status").equals("01")) {
if (!"01".equals(right_point.getString("point_status"))) {
throw new BadRequestException(point_jo.getString("point_code") + "所在一截输送线缓存位存在货物，请使用【载具横移】功能将货物横移！");
}
}
@@ -379,7 +379,7 @@ public class ShippingServiceImpl implements ShippingService {
}
String point_status = del_jo.getString("point_status");
if (point_status.equals("01")) {
if ("01".equals(point_status)) {
throw new BadRequestException("该点位上不存在载具！");
}
@@ -446,10 +446,10 @@ public class ShippingServiceImpl implements ShippingService {
JSONArray cut_rows = WQL.getWO("PDA_02").addParam("flag", "13").addParam("qzzno", qzzno).addParam("product_area", product_area).addParam("point_location", point_location).process().getResultJSONArray(0);
if (cut_rows.size() > 3) {
if (point_location.equals("0")) {
if ("0".equals(point_location)) {
throw new BadRequestException("已超过上半段输送线最大负荷任务数，请等下一子卷送出再进行配送，并将该空载具送回！");
}
if (point_location.equals("1")) {
if ("1".equals(point_location)) {
throw new BadRequestException("已超过下半段输送线最大负荷任务数，请等下一子卷送出再进行配送，并将该空载具送回！");
}
}

36
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java
View File

@@ -68,23 +68,23 @@ public class ProductInstorServiceImpl implements ProductInstorService {
UserStorServiceImpl userStorService = new UserStorServiceImpl();
String in_stor_id = userStorService.getInStor();
if (option.equals("1")) {
if ("1".equals(option)) {
map.put("flag", "1");
//如果是报废入库要查询对应的报废出库
rows = WQL.getWO("PDA_ST_01").addParamMap(map).process().getResultJSONArray(0);
}
if (option.equals("2")) {
if ("2".equals(option)) {
map.put("flag", "2");
map.put("in_stor_id", in_stor_id);
//查询状态为生成的子卷包装关系对应表
rows = WQL.getWO("PDA_ST_01").addParamMap(map).process().getResultJSONArray(0);
}
if (option.equals("3")) {
if ("3".equals(option)) {
map.put("flag", "4");
//查询状态为生成的子卷包装关系对应表
rows = WQL.getWO("PDA_ST_01").addParamMap(map).process().getResultJSONArray(0);
}
if (option.equals("4")) {
if ("4".equals(option)) {
map.put("flag", "8");
//查询状态为生成的子卷包装关系对应表
rows = WQL.getWO("PDA_ST_01").addParamMap(map).process().getResultJSONArray(0);
@@ -130,22 +130,22 @@ public class ProductInstorServiceImpl implements ProductInstorService {
boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
try {
if (tryLock) {
if (option.equals("1")) {
if ("1".equals(option)) {
mst_jo.put("bill_type", "0003");
}
if (option.equals("2")) {
if ("2".equals(option)) {
mst_jo.put("bill_type", "0001");
}
if (option.equals("3")) {
if ("3".equals(option)) {
mst_jo.put("bill_type", "0002");
}
if (option.equals("4")) {
if ("4".equals(option)) {
mst_jo.put("bill_type", "0005");
}
HashMap box_map = box_rows.get(0);
Object sub_type = box_map.get("sub_type");
if (ObjectUtil.isNotEmpty(sub_type)){
if (sub_type.equals("1")){
if ("1".equals(sub_type)){
//如果为返检的包装关系则变为返检入库
mst_jo.put("bill_type", "0006");
}
@@ -154,7 +154,7 @@ public class ProductInstorServiceImpl implements ProductInstorService {
HashMap box_row = box_rows.get(i);
sub_type = box_row.get("sub_type");
if (ObjectUtil.isNotEmpty(sub_type)){
if (sub_type.equals("2")){
if ("2".equals(sub_type)){
//如果为改切的包装关系则变为改切入库
mst_jo.put("bill_type", "0007");
break;
@@ -167,7 +167,7 @@ public class ProductInstorServiceImpl implements ProductInstorService {
//查询仓库
JSONObject stor = new JSONObject();
if(sub_jo.getString("ext_code").equals("BC01")) {
if("BC01".equals(sub_jo.getString("ext_code"))) {
stor = WQLObject.getWQLObject("st_ivt_bsrealstorattr").query("is_delete = '0' AND is_used = '1' AND is_productstore = '0' AND stor_code = 'BC01'").uniqueResult(0);
} else {
stor = WQLObject.getWQLObject("st_ivt_bsrealstorattr").query("is_delete = '0' AND is_used = '1' AND is_productstore = '1'").uniqueResult(0);
@@ -190,8 +190,8 @@ public class ProductInstorServiceImpl implements ProductInstorService {
}
//判断是否虚拟
if (!is_virtual.equals("1")) {
if (sub_jo.getString("ext_code").equals("BC01")) {
if (!"1".equals(is_virtual)) {
if ("BC01".equals(sub_jo.getString("ext_code"))) {
throw new BadRequestException("二期仓库木箱，请进行虚拟入库!");
}
@@ -231,13 +231,13 @@ public class ProductInstorServiceImpl implements ProductInstorService {
if (ObjectUtil.isEmpty(point_jo)) {
throw new BadRequestException("未查询到对应的点位！");
} else {
if (point_jo.getString("is_used").equals("0")) {
if ("0".equals(point_jo.getString("is_used"))) {
throw new BadRequestException("该点位已经被禁用！");
}
if (point_jo.getString("is_delete").equals("1")) {
if ("1".equals(point_jo.getString("is_delete"))) {
throw new BadRequestException("该点位已经被删除！");
}
if (!point_jo.getString("region_code").equals("NBJ01")) {
if (!"NBJ01".equals(point_jo.getString("region_code"))) {
throw new BadRequestException("请扫描内包间入库点位！");
}
}
@@ -264,7 +264,7 @@ public class ProductInstorServiceImpl implements ProductInstorService {
JSONObject struct = WQL.getWO("PDA_ST_01")
.addParam("flag", "3")
.addParam("stor_id", stor.getString("stor_id"))
.addParam("sect_id", sub_jo.getString("ext_code").equals("BC01") ? "" : whereJson.getString("sect_id"))
.addParam("sect_id", "BC01".equals(sub_jo.getString("ext_code")) ? "" : whereJson.getString("sect_id"))
.process().uniqueResult(0);
if (ObjectUtil.isEmpty(struct)){
@@ -468,7 +468,7 @@ public class ProductInstorServiceImpl implements ProductInstorService {
JSONArray sub_rows = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '"+vehicle_code+"'").getResultJSONArray(0);
for (int i = 0; i < sub_rows.size(); i++) {
JSONObject sub_row = sub_rows.getJSONObject(i);
if (StrUtil.isNotEmpty(sub_row.getString("need_delete")) && sub_row.getString("need_delete").equals("1")){
if (StrUtil.isNotEmpty(sub_row.getString("need_delete")) && "1".equals(sub_row.getString("need_delete"))){
WQLObject.getWQLObject("pdm_bi_subpackagerelation").delete(sub_row);
}
}

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java
View File

@@ -75,7 +75,7 @@ public class ProductionOutServiceImpl implements ProductionOutService {
JSONArray sub_rows = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '"+box_no+"'").getResultJSONArray(0);
for (int i = 0; i < sub_rows.size(); i++) {
JSONObject sub_row = sub_rows.getJSONObject(i);
if (StrUtil.isNotEmpty(sub_row.getString("need_delete")) && sub_row.getString("need_delete").equals("1")){
if (StrUtil.isNotEmpty(sub_row.getString("need_delete")) && "1".equals(sub_row.getString("need_delete"))){
WQLObject.getWQLObject("pdm_bi_subpackagerelation").delete(sub_row);
}
}
@@ -86,7 +86,7 @@ public class ProductionOutServiceImpl implements ProductionOutService {
JSONArray sub_rows2 = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '"+jsonPoint2.getString("vehicle_code")+"'").getResultJSONArray(0);
for (int i = 0; i < sub_rows2.size(); i++) {
JSONObject sub_row = sub_rows2.getJSONObject(i);
if (StrUtil.isNotEmpty(sub_row.getString("need_delete")) && sub_row.getString("need_delete").equals("1")){
if (StrUtil.isNotEmpty(sub_row.getString("need_delete")) && "1".equals(sub_row.getString("need_delete"))){
WQLObject.getWQLObject("pdm_bi_subpackagerelation").delete(sub_row);
}
}

2
lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java
View File

@@ -214,7 +214,7 @@ public class CoolPointIvtServiceImpl implements CoolPointIvtService {
//判断该接口是否需要回传
JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'momRollSemiFGInboundComplete'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")){
if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))){
new LmsToMesServiceImpl().momRollSemiFGInboundComplete(param);
}
}

8
lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java
View File

@@ -208,7 +208,7 @@ public class SlittingproductionplanServiceImpl implements Slittingproductionplan
map.put("update_optid",currentUserId);
map.put("update_optname",currentUsername);
map.put("update_time",DateUtil.now());
if (jsonObject.getString("order_type").equals("1")){
if ("1".equals(jsonObject.getString("order_type"))){
tab.update(map,"parent_container_name = '"+json.getString("parent_container_name")+"'");
mom_jo.put("contain_name",json.getString("contain_name"));
mom_jo.put("warehouse","1");
@@ -221,7 +221,7 @@ public class SlittingproductionplanServiceImpl implements Slittingproductionplan
//判断该接口是否需要回传
JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'airSwellWithPaperTubeAssArrival'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")){
if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))){
lmsToMesService.cutPlanMomRollDeliveryComplete(mom_jo);
}
}
@@ -250,7 +250,7 @@ public class SlittingproductionplanServiceImpl implements Slittingproductionplan
jo.put("container_name", jsonObject.getString("container_name"));
//判断该接口是否需要回传
JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'airSwellWithPaperTubeAssComplete'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")) {
if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) {
lmsToMesService.airSwellWithPaperTubeAssComplete(jo);
}
@@ -285,7 +285,7 @@ public class SlittingproductionplanServiceImpl implements Slittingproductionplan
jo.put("container_name", jsonObject.getString("container_name"));
//判断该接口是否需要回传
JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'airSwellWithPaperTubeAssComplete'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")) {
if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) {
lmsToMesService.airSwellWithPaperTubeAssArrival(jo);
}
}

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java
View File

@@ -76,7 +76,7 @@ public class AcsUtil {
throw new BadRequestException(result.getString("message"));
} else {
//如果向ACS下发任务，变更任务状态为下发
if (api.equals("api/wms/task")) {
if ("api/wms/task".equals(api)) {
for (int i = 0; i < list.size(); i++) {
JSONObject task_jo = list.getJSONObject(i);
HashMap<String, String> map = new HashMap<>();
@@ -141,7 +141,7 @@ public class AcsUtil {
throw new BadRequestException(result.getString("message"));
} else {
//如果向ACS下发任务，变更任务状态为下发
if (api.equals("api/wms/task")) {
if ("api/wms/task".equals(api)) {
for (int i = 0; i < list.size(); i++) {
JSONObject task_jo = list.getJSONObject(i);
HashMap<String, String> map = new HashMap<>();

12
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java
View File

@@ -161,7 +161,7 @@ public class PointServiceImpl implements PointService {
}
String pointStatus = dto.getPoint_status();
if (ObjectUtil.isNotEmpty(pointStatus) && pointStatus.equals("1")) {
if (ObjectUtil.isNotEmpty(pointStatus) && "1".equals(pointStatus)) {
entity.setMaterial_id(null);
entity.setVehicle_type(null);
entity.setVehicle_code(null);
@@ -213,7 +213,7 @@ public class PointServiceImpl implements PointService {
//如果是仓位点位，更新状态前，先去查询仓位点位所对应的库区是否启用，如果禁用抛出异常
String struct_code = json.getString("point_code");
String point_type = json.getString("point_type");
if (point_type.equals("01")) {
if ("01".equals(point_type)) {
JSONObject st_ivt_bsRealStorAttr = WQLObject.getWQLObject("ST_IVT_StructAttr").query(" struct_code = '" + struct_code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(st_ivt_bsRealStorAttr)) {
String sect_id = st_ivt_bsRealStorAttr.getString("sect_id");
@@ -289,7 +289,7 @@ public class PointServiceImpl implements PointService {
String used = jsonObject.getString("used");
for (int i = 0; i < data.size(); i++) {
JSONObject object = data.getJSONObject(i);
if (used.equals("1")) {
if ("1".equals(used)) {
object.put("is_used", 1);
} else {
object.put("is_used", 0);
@@ -310,7 +310,7 @@ public class PointServiceImpl implements PointService {
String lock = jsonObject.getString("lock_type");
for (int i = 0; i < data.size(); i++) {
JSONObject object = data.getJSONObject(i);
if (lock.equals("1")) {
if ("1".equals(lock)) {
object.put("lock_type", 1);
} else {
object.put("lock_type", 2);
@@ -433,10 +433,10 @@ public class PointServiceImpl implements PointService {
mp.put("载具数量", object.getString("vehicle_qty"));
mp.put("生产区域", object.getString("product_area"));
mp.put("备注", object.getString("remark"));
if (object.getString("is_used").equals("0")) {
if ("0".equals(object.getString("is_used"))) {
mp.put("是否启用", "否");
}
if (object.getString("is_used").equals("1")) {
if ("1".equals(object.getString("is_used"))) {
mp.put("是否启用", "是");
}
mp.put("修改人", object.getString("update_optname"));

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java
View File

@@ -122,7 +122,7 @@ public class TaskServiceImpl implements TaskService {
String task_id = MapUtil.getStr(map, "task_id");
String method_name = MapUtil.getStr(map, "method_name");
JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
if (method_name.equals("finish")){
if ("finish".equals(method_name)){
//强制执行，只把任务变更成完成状态
// 更改任务状态为完成
taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode());

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java
View File

@@ -294,7 +294,7 @@ public class CallEmpReelTask extends AbstractAcsTask {
} else {
json.put("priority", priority_jo.getString("value"));
}
if (form.getString("task_type").equals("010101")) {
if ("010101".equals(form.getString("task_type"))) {
json.put("acs_task_type", "1");
} else {
json.put("acs_task_type", "3");

12
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java
View File

@@ -110,7 +110,7 @@ public class CoolCutTask extends AbstractAcsTask {
String point_code3 = jsonTask.getString("point_code3");
String point_code4 = jsonTask.getString("point_code4");
if (jsonTask.getString("task_type").equals("010301")) {
if ("010301".equals(jsonTask.getString("task_type"))) {
// 更新主表状态
JSONObject coolMst = ivtTab.query("task_id = '" + task_id + "'").uniqueResult(0);
coolMst.put("bill_status", "50");
@@ -171,12 +171,12 @@ public class CoolCutTask extends AbstractAcsTask {
mom_jo.put("warehouse", "1");
//判断该接口是否需要回传
JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'cutPlanMomRollDeliveryComplete'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")) {
if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) {
new LmsToMesServiceImpl().cutPlanMomRollDeliveryComplete(mom_jo);
}
}
if (jsonTask.getString("task_type").equals("010302")) {
if ("010302".equals(jsonTask.getString("task_type"))) {
// 更新主表状态
JSONObject coolMst = ivtTab.query("task_id = '" + task_id + "'").uniqueResult(0);
coolMst.put("bill_status", "50");
@@ -217,12 +217,12 @@ public class CoolCutTask extends AbstractAcsTask {
mom_jo.put("warehouse", "1");
//判断该接口是否需要回传
JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'cutPlanMomRollDeliveryComplete'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")) {
if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) {
new LmsToMesServiceImpl().cutPlanMomRollDeliveryComplete(mom_jo);
}
}
if (jsonTask.getString("task_type").equals("010303")) {
if ("010303".equals(jsonTask.getString("task_type"))) {
//更新分切区空轴库存
JSONObject cut_jo2 = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("empty_point_code = '" + point_code1 + "'").uniqueResult(0);
cut_jo2.put("empty_point_status", "01");
@@ -303,7 +303,7 @@ public class CoolCutTask extends AbstractAcsTask {
} else {
json.put("priority", priority_jo.getString("value"));
}
if (form.getString("task_type").equals("010301")) {
if ("010301".equals(form.getString("task_type"))) {
json.put("acs_task_type", "2");
} else {
json.put("acs_task_type", "3");

26
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java
View File

@@ -49,7 +49,7 @@ public class CutConveyorTask extends AbstractAcsTask {
JSONObject json = arr.getJSONObject(i);
String vehicle_code = "";
if (json.getString("task_type").equals("010507")) {
if ("010507".equals(json.getString("task_type"))) {
vehicle_code = json.getString("vehicle_code");
} else {
vehicle_code = json.getString("vehicle_code2");
@@ -88,7 +88,7 @@ public class CutConveyorTask extends AbstractAcsTask {
taskTab.update(jsonTask);
//初始化任务开始前分切计划的状态
if (jsonTask.getString("task_type").equals("010402") && StrUtil.isNotEmpty(jsonTask.getString("vehicle_code"))) {
if ("010402".equals(jsonTask.getString("task_type")) && StrUtil.isNotEmpty(jsonTask.getString("vehicle_code"))) {
//更新该气涨轴对应的分切计划状态
HashMap map = new HashMap();
map.put("flag", "601");
@@ -112,7 +112,7 @@ public class CutConveyorTask extends AbstractAcsTask {
taskTab.update(jsonTask);
//只有输送入的时候才调用MES
if (jsonTask.getString("task_type").equals("010402")) {
if ("010402".equals(jsonTask.getString("task_type"))) {
//调用MES接口，通知MES运输中
LmsToMesService lmsToMesService = SpringContextHolder.getBean(LmsToMesService.class);
JSONArray rows = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + jsonTask.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_delete ='0' AND status < '09'").getResultJSONArray(0);
@@ -123,7 +123,7 @@ public class CutConveyorTask extends AbstractAcsTask {
jo.put("is_send", "1");
//判断该接口是否需要回传
JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'airSwellWithPaperTubeAssComplete'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")) {
if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) {
lmsToMesService.airSwellWithPaperTubeAssComplete(jo);
}
}
@@ -142,7 +142,7 @@ public class CutConveyorTask extends AbstractAcsTask {
String point_code2 = jsonTask.getString("point_code2");
//分切输送出任务
if (jsonTask.getString("task_type").equals("010401")) {
if ("010401".equals(jsonTask.getString("task_type"))) {
// 校验终点是否存在
JSONObject jsonIvt = ivtTab.query("point_code ='" + point_code1 + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonIvt)) {
@@ -170,7 +170,7 @@ public class CutConveyorTask extends AbstractAcsTask {
//查询当前点位是否变为有货,有货则不创建
JSONObject left_jo = WQLObject.getWQLObject("st_ivt_deliverypointivt").query("point_code = '" + point_code1 + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(right_point) && left_jo.getString("point_status").equals("01")) {
if (ObjectUtil.isNotEmpty(right_point) && "01".equals(left_jo.getString("point_status"))) {
//创建载具横移任务
String translate_code1 = right_point.getString("point_code");
String translate_code2 = point_code1;
@@ -195,7 +195,7 @@ public class CutConveyorTask extends AbstractAcsTask {
}
//分切输送入任务
if (jsonTask.getString("task_type").equals("010402")) {
if ("010402".equals(jsonTask.getString("task_type"))) {
// 校验终点是否存在
JSONObject jsonIvt = ivtTab.query("point_code ='" + point_code2 + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonIvt)) {
@@ -228,7 +228,7 @@ public class CutConveyorTask extends AbstractAcsTask {
jo.put("ContainerName", ContainerName);
//判断该接口是否需要回传
JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'airSwellWithPaperTubeAssArrival'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")) {
if (ObjectUtil.isNotEmpty(back_jo) && "1".equals(back_jo.getString("is_back"))) {
lmsToMesService.airSwellWithPaperTubeAssArrival(row);
}
}
@@ -285,7 +285,7 @@ public class CutConveyorTask extends AbstractAcsTask {
}
}
}
if (jsonTask.getString("task_type").equals("010406")) {
if ("010406".equals(jsonTask.getString("task_type"))) {
JSONObject jsonIvt2 = ivtTab.query("point_code ='" + point_code2 + "'").uniqueResult(0);
@@ -303,12 +303,12 @@ public class CutConveyorTask extends AbstractAcsTask {
if (StrUtil.isNotEmpty(jsonTask.getString("vehicle_code"))) {
JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("vehicle_code = '" + jsonTask.getString("vehicle_code") + "' AND is_delete = '0' AND task_status < '07'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(task_jo)) {
if (task_jo.getString("task_type").equals("010405")) {
if ("010405".equals(task_jo.getString("task_type"))) {
//入站
task_jo.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
task_jo.put("point_code1", jsonTask.getString("point_code2"));
}
if (task_jo.getString("task_type").equals("010403")) {
if ("010403".equals(task_jo.getString("task_type"))) {
//出站
task_jo.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
task_jo.put("point_code1", jsonTask.getString("point_code2"));
@@ -323,7 +323,7 @@ public class CutConveyorTask extends AbstractAcsTask {
//如果载具横移完成时，判断该空载具是否存在对应终点为空的末次下卷或者废箔下卷任务
JSONObject task_jo2 = WQLObject.getWQLObject("sch_base_task").query("vehicle_code2 = '" + jsonTask.getString("vehicle_code2") + "' AND is_delete = '0' AND task_status = '02'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(task_jo2)) {
if (task_jo2.getString("task_type").equals("010404")) {
if ("010404".equals(task_jo2.getString("task_type"))) {
//出站
task_jo2.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
task_jo2.put("point_code2", jsonTask.getString("point_code2"));
@@ -359,7 +359,7 @@ public class CutConveyorTask extends AbstractAcsTask {
String point_code2 = form.getString("point_code2");
//JSONObject point1_jo = WQLObject.getWQLObject("sch_base_point").query("point_code = '" + point_code1 + "'").uniqueResult(0);
// JSONObject point2_jo = WQLObject.getWQLObject("sch_base_point").query("point_code = '" + point_code2 + "'").uniqueResult(0);
if (!form.getString("task_type").equals("010507") && !form.getString("task_type").equals("010406")) {
if (!"010507".equals(form.getString("task_type")) && !"010406".equals(form.getString("task_type"))) {
/*if (isSingleTask(point_code1) && !point1_jo.getString("point_type").equals("6") && !point1_jo.getString("point_type").equals("7")) {
throw new BadRequestException("点位：" + point_code1 + "存在未完成的任务！");
}

20
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java
View File

@@ -92,7 +92,7 @@ public class CutTrussTask extends AbstractAcsTask {
taskTab.update(jsonTask);
//桁架标准任务
if (jsonTask.getString("task_type").equals("010403")) {
if ("010403".equals(jsonTask.getString("task_type"))) {
//更新入站气涨轴的分切计划状态
JSONArray plan_jo = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + jsonTask.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status IN ('04','05')").getResultJSONArray(0);
if (ObjectUtil.isEmpty(plan_jo)) {
@@ -119,7 +119,7 @@ public class CutTrussTask extends AbstractAcsTask {
}
//分切>输送线 子卷出站
if (jsonTask.getString("task_type").equals("010404")) {
if ("010404".equals(jsonTask.getString("task_type"))) {
if (!jsonTask.getString("vehicle_code").contains("废箔")) {
//更新出站气涨轴的分切计划状态
JSONArray plan_jo2 = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + jsonTask.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '06'").getResultJSONArray(0);
@@ -135,7 +135,7 @@ public class CutTrussTask extends AbstractAcsTask {
}
}
//分切>输送线 子卷入站
if (jsonTask.getString("task_type").equals("010405")) {
if ("010405".equals(jsonTask.getString("task_type"))) {
//更新入站气涨轴的分切计划状态
JSONArray plan_jo = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + jsonTask.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status IN ('04','05') ").getResultJSONArray(0);
if (ObjectUtil.isEmpty(plan_jo)) {
@@ -167,7 +167,7 @@ public class CutTrussTask extends AbstractAcsTask {
//桁架标准任务，双工位任务
if (jsonTask.getString("task_type").equals("010403")) {
if ("010403".equals(jsonTask.getString("task_type"))) {
//更新分切机对应位置的气涨轴
JSONObject cut_point = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("up_point_code = '" + jsonTask.getString("point_code2") + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(cut_point)) {
@@ -228,7 +228,7 @@ public class CutTrussTask extends AbstractAcsTask {
}
//子卷出站任务
if (jsonTask.getString("task_type").equals("010404")) {
if ("010404".equals(jsonTask.getString("task_type"))) {
//更新输送线的气涨轴编码
JSONObject delivery_point = WQLObject.getWQLObject("ST_IVT_DeliveryPointIvt").query("point_code = '" + jsonTask.getString("point_code2") + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(delivery_point)) {
@@ -264,7 +264,7 @@ public class CutTrussTask extends AbstractAcsTask {
}
//子卷入站
if (jsonTask.getString("task_type").equals("010405")) {
if ("010405".equals(jsonTask.getString("task_type"))) {
//更新输送线的气涨轴编码
JSONObject delivery_point = WQLObject.getWQLObject("ST_IVT_DeliveryPointIvt").query("point_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(delivery_point)) {
@@ -328,7 +328,7 @@ public class CutTrussTask extends AbstractAcsTask {
//判断对应缓存位是否存在需要末次下卷或者废箔下卷的任务
JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("vehicle_code2 = '" + right_point.getString("vehicle_code") + "' AND is_delete = '0' AND task_status = '02'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(task_jo)) {
if (task_jo.getString("task_type").equals("010404")) {
if ("010404".equals(task_jo.getString("task_type"))) {
//出站
task_jo.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
task_jo.put("point_code2", jsonTask.getString("point_code1"));
@@ -392,7 +392,7 @@ public class CutTrussTask extends AbstractAcsTask {
tab.insert(json);
//桁架标准任务
if (form.getString("task_type").equals("010403")) {
if ("010403".equals(form.getString("task_type"))) {
//更新入站气涨轴的分切计划状态
JSONArray plan_jo = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + json.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '03'").getResultJSONArray(0);
if (ObjectUtil.isEmpty(plan_jo)) {
@@ -419,7 +419,7 @@ public class CutTrussTask extends AbstractAcsTask {
}
//分切>输送线 子卷出站
if (form.getString("task_type").equals("010404") && !json.getString("vehicle_code").contains("废箔")) {
if ("010404".equals(form.getString("task_type")) && !json.getString("vehicle_code").contains("废箔")) {
//更新出站气涨轴的分切计划状态
JSONArray plan_jo2 = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + json.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '05'").getResultJSONArray(0);
if (ObjectUtil.isEmpty(plan_jo2)) {
@@ -433,7 +433,7 @@ public class CutTrussTask extends AbstractAcsTask {
}
}
//分切>输送线 子卷入站
if (form.getString("task_type").equals("010405")) {
if ("010405".equals(form.getString("task_type"))) {
//更新入站气涨轴的分切计划状态
JSONArray plan_jo = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + json.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '03'").getResultJSONArray(0);
if (ObjectUtil.isEmpty(plan_jo)) {

10
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/EmptyVehicleTask.java
View File

@@ -90,19 +90,19 @@ public class EmptyVehicleTask extends AbstractAcsTask {
JSONObject task_jo = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '"+taskObj.getString("task_id")+"'").uniqueResult(0);
HashMap map = new HashMap();
//1:执行中,2:完成 ,3:acs取消
if (status.equals("0")){
if ("0".equals(status)){
// 更新删除字段
map.put("is_delete","1");
map.put("update_time", DateUtil.now());
HashMap<String, String> point_map = new HashMap<>();
point_map.put("lock_type","1");
if (task_jo.getString("task_type").equals("010502")) {
if ("010502".equals(task_jo.getString("task_type"))) {
point_table.update(point_map, "point_code = '" + task_jo.getString("point_code2") + "'");
struct_table.update(point_map, "struct_code = '" + task_jo.getString("point_code2") + "'");
}
if (task_jo.getString("task_type").equals("010504")) {
if ("010504".equals(task_jo.getString("task_type"))) {
point_table.update(point_map, "point_code = '" + task_jo.getString("point_code1") + "'");
struct_table.update(point_map, "struct_code = '" + task_jo.getString("point_code1") + "'");
}
@@ -114,7 +114,7 @@ public class EmptyVehicleTask extends AbstractAcsTask {
if (status.equals(TaskStatusEnum.FINISHED.getCode())) {
map.put("task_status", TaskStatusEnum.FINISHED.getCode());
//解锁货位、点位。更新点位仓位状态
if (task_jo.getString("task_type").equals("010502")){
if ("010502".equals(task_jo.getString("task_type"))){
String vehicle_code = task_jo.getString("vehicle_code");
map.put("lock_type", "1");
map.put("point_status", "3");
@@ -126,7 +126,7 @@ public class EmptyVehicleTask extends AbstractAcsTask {
struct_map.put("is_emptyvehicle", "1");
struct_table.update(struct_map, "struct_code = '" + task_jo.getString("point_code2") + "'");
}
if (task_jo.getString("task_type").equals("010504")){
if ("010504".equals(task_jo.getString("task_type"))){
map.put("lock_type", "1");
map.put("point_status", "1");
map.put("vehicle_code", "");

2
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java
View File

@@ -115,7 +115,7 @@ public class OutChargeServiceImpl implements OutChargeService {
//校验主表状态为生成
JSONObject mst_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + whereJson.get("iostorinv_id") + "'").uniqueResult(0);
if (!mst_jo.getString("bill_status").equals("99")) {
if (!"99".equals(mst_jo.getString("bill_status"))) {
throw new BadRequestException("主表状态必须为完成！");
}

6
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/StorPublicServiceImpl.java
View File

@@ -465,7 +465,7 @@ public class StorPublicServiceImpl implements StorPublicService {
throw new BadRequestException("点位仓位更新未查询到符合条件的点位仓位！");
}
HashMap<String, String> map = new HashMap<>();
if (lock_type.equals("1")) {//解锁
if ("1".equals(lock_type)) {//解锁
map.put("lock_type", lock_type);
map.put("task_code", "");
map.put("inv_type", "");
@@ -474,7 +474,7 @@ public class StorPublicServiceImpl implements StorPublicService {
map.put("point_status", "1");
map.put("storagevehicle_code", "");
map.put("vehicle_code", "");
if (from.containsKey("is_free") && !from.getString("is_free").equals("1") && StrUtil.isNotEmpty(storagevehicle_code)) {
if (from.containsKey("is_free") && !"1".equals(from.getString("is_free")) && StrUtil.isNotEmpty(storagevehicle_code)) {
map.put("storagevehicle_code", storagevehicle_code);
map.put("storagevehicle_qty", "1");
map.put("vehicle_code", storagevehicle_code);
@@ -530,7 +530,7 @@ public class StorPublicServiceImpl implements StorPublicService {
throw new BadRequestException("点位仓位更新未查询到符合条件的点位仓位！");
}
HashMap<String, String> map = new HashMap<>();
if (lock_type.equals("1")) {//解锁
if ("1".equals(lock_type)) {//解锁
map.put("lock_type", lock_type);
map.put("task_code", "");
map.put("inv_type", "");

4
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java
View File

@@ -323,7 +323,7 @@ public class ChangeServiceImpl implements ChangeService {
}
//判断是否已生成过了任务，无未生成则插入任务
JSONObject task = wo_Task.query("is_delete = '0' and task_status='04' and point_code1 ='" + jo.getString("start_point_code") + "'").uniqueResult(0);
if (task != null || is_task.equals("0")) {
if (task != null || "0".equals(is_task)) {
jo.put("task_id", task.getString("task_id"));
} else {
task = new JSONObject();
@@ -726,7 +726,7 @@ public class ChangeServiceImpl implements ChangeService {
if (ObjectUtil.isEmpty(jo_mst)) {
throw new BadRequestException("未查到相关出库单");
}
if (jo_mst.getString("bill_status").equals("99")) {
if ("99".equals(jo_mst.getString("bill_status"))) {
throw new BadRequestException("已审核单据不允许取消完成！");
}
JSONObject task = wo_Task.query("taskdtl_id='" + taskdtl_id + "'").uniqueResult(0);

8
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java
View File

@@ -308,11 +308,11 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
if (ObjectUtil.isEmpty(isLock)) {
if (placement_type.equals("03")) {
if ("03".equals(placement_type)) {
// 右通
struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type = '1' AND block_num = '" + block_num + "'AND placement_type = '" + placement_type + "' AND row_num = '" + row_num + "' AND is_delete = '0' AND is_used = '1' AND IFNULL(storagevehicle_code,'') = '' order by out_order_seq desc").uniqueResult(0);
break;
} else if (placement_type.equals("02")) {
} else if ("02".equals(placement_type)) {
// 左通
struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type = '1' AND block_num = '" + block_num + "'AND placement_type = '" + placement_type + "' AND row_num = '" + row_num + "' AND is_delete = '0' AND is_used = '1' AND IFNULL(storagevehicle_code,'') = '' order by out_order_seq").uniqueResult(0);
break;
@@ -608,7 +608,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
}
//判断是否已生成过了任务，无未生成则插入任务
JSONObject task = wo_Task.query("is_delete = '0' and task_status='04' and point_code1 ='" + jo.getString("start_point_code") + "'").uniqueResult(0);
if (task != null || is_task.equals("0")) {
if (task != null || "0".equals(is_task)) {
jo.put("task_id", task.getString("task_id"));
} else {
task = new JSONObject();
@@ -1060,7 +1060,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
if (ObjectUtil.isEmpty(jo_mst)) {
throw new BadRequestException("未查到相关出库单");
}
if (jo_mst.getString("bill_status").equals("99")) {
if ("99".equals(jo_mst.getString("bill_status"))) {
throw new BadRequestException("已审核单据不允许取消完成！");
}
JSONObject task = wo_Task.query("taskdtl_id='" + taskdtl_id + "'").uniqueResult(0);

28
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -293,11 +293,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
String nickName = SecurityUtils.getCurrentNickName();
String user = map.getString("user");
if (ObjectUtil.isNotEmpty(user)) {
if (user.equals("mes")) {
if ("mes".equals(user)) {
currentUserId = "2";
nickName = "mes用户";
}
if (user.equals("sap")) {
if ("sap".equals(user)) {
currentUserId = "3";
nickName = "sap用户";
}
@@ -327,7 +327,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
map.put("is_upload", "0");
map.put("out_stor_id", map.getString("out_stor_id"));
if (ObjectUtil.isNotEmpty(user)) {
if (!user.equals("mes") || user.equals("sap")) {
if (!"mes".equals(user) || "sap".equals(user)) {
Long deptId = SecurityUtils.getDeptId();
map.put("sysdeptid", deptId);
map.put("syscompanyid", deptId);
@@ -435,11 +435,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
String nickName = SecurityUtils.getCurrentNickName();
String user = map.getString("user");
if (ObjectUtil.isNotEmpty(user)) {
if (user.equals("mes")) {
if ("mes".equals(user)) {
currentUserId = "2";
nickName = "mes用户";
}
if (user.equals("sap")) {
if ("sap".equals(user)) {
currentUserId = "3";
nickName = "sap用户";
}
@@ -468,7 +468,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
map.put("is_delete", "0");
map.put("is_upload", "0");
if (ObjectUtil.isNotEmpty(user)) {
if (!user.equals("mes") || user.equals("sap")) {
if (!"mes".equals(user) || "sap".equals(user)) {
Long deptId = SecurityUtils.getDeptId();
map.put("sysdeptid", deptId);
map.put("syscompanyid", deptId);
@@ -4349,7 +4349,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
}
// 如果是拆分入库则将包装关系改为生成状态
if (jo_mst.getString("bill_type").equals("1005") || (jo_mst.getString("bill_type").equals("1009"))) {
if ("1005".equals(jo_mst.getString("bill_type")) || ("1009".equals(jo_mst.getString("bill_type")))) {
jsonSub.put("status", "0");
} else {
jsonSub.put("status", "3");
@@ -4380,14 +4380,14 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
}
JSONObject out_jo = WQLObject.getWQLObject("ST_IVT_IOStorInv").query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0);
if (out_jo.getString("bill_type").equals("1004")) {
if ("1004".equals(out_jo.getString("bill_type"))) {
//调拨出库自动生成调拨入库单
WQLObject dtl_wql = WQLObject.getWQLObject("st_ivt_iostorinvdtl");
WQLObject mst_wql = WQLObject.getWQLObject("ST_IVT_IOStorInv");
WQLObject dis_wql = WQLObject.getWQLObject("ST_IVT_IOStorInvDis");
//校验主表状态为生成
if (!out_jo.getString("bill_status").equals("99")) {
if (!"99".equals(out_jo.getString("bill_status"))) {
throw new BadRequestException("主表状态必须为完成！");
}
@@ -4478,7 +4478,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
}*/
if (out_jo.getString("bill_type").equals("1003") || out_jo.getString("bill_type").equals("1006")) {
if ("1003".equals(out_jo.getString("bill_type")) || "1006".equals(out_jo.getString("bill_type"))) {
//如果为返检出库或者改切出库删除对应的包装关系
JSONArray dis_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinv_id = '" + iostorinv_id + "'").getResultJSONArray(0);
for (int i = 0; i < dis_rows.size(); i++) {
@@ -4490,7 +4490,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
}
//如果是虚拟区的出库，直接把包装关系删除；如果为立库的包装关系，将解绑删除标识置为1。当发货区解绑时，删除包装关系
String pcsn = dis_row.getString("pcsn");
if (sect_jo.getString("sect_type_attr").equals("09")) {
if ("09".equals(sect_jo.getString("sect_type_attr"))) {
WQLObject.getWQLObject("pdm_bi_subpackagerelation").delete("container_name = '" + pcsn + "'");
} else {
HashMap<String, String> map = new HashMap<>();
@@ -4817,7 +4817,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
if (ObjectUtil.isEmpty(mst_jo)) {
throw new BadRequestException("未查询到对应的出库单据！");
} else {
if (mst_jo.getString("bill_type").equals("1003") || mst_jo.getString("bill_type").equals("1006")) {
if ("1003".equals(mst_jo.getString("bill_type")) || "1006".equals(mst_jo.getString("bill_type"))) {
HashMap<String, String> map = new HashMap<>();
map.put("need_delete", "1");
WQLObject.getWQLObject("pdm_bi_subpackagerelation").update(map, "package_box_sn = '" + task.getString("vehicle_code") + "'");
@@ -4905,7 +4905,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
throw new BadRequestException("未查到相关出库单");
}
if (jo_mst.getString("bill_status").equals("99")) {
if ("99".equals(jo_mst.getString("bill_status"))) {
throw new BadRequestException("已完成单据不允许取消完成！");
}
@@ -4985,7 +4985,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
JSONObject mst_row = mst_wql.query("iostorinv_id = '" + whereJson.get("iostorinv_id") + "'").uniqueResult(0);
//校验主表状态为生成
String bill_status = mst_row.getString("bill_status");
if (!bill_status.equals("10")) {
if (!"10".equals(bill_status)) {
throw new BadRequestException("主表状态必须为生成状态！");
}
JSONArray dtl_rows = dtl_wql.query("iostorinv_id = '" + whereJson.get("iostorinv_id") + "'").getResultJSONArray(0);

4
lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
View File

@@ -253,7 +253,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
new LmsToMesServiceImpl().childRollFGOutboundComplete(paramMesMst);
jo_mst.put("upload_mes", "1");
if (jo_mst.getString("upload_sap").equals("1")) {
if ("1".equals(jo_mst.getString("upload_sap"))) {
jo_mst.put("is_upload", "1");
jo_mst.put("upload_optid", SecurityUtils.getCurrentUserId());
jo_mst.put("upload_time", DateUtil.now());
@@ -594,7 +594,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
new LmsToSapServiceImpl().returnDelivery(param);
jo_mst.put("upload_sap", "1");
if (jo_mst.getString("upload_mes").equals("1") || is_productstore.equals("0")) {
if ("1".equals(jo_mst.getString("upload_mes")) || "0".equals(is_productstore)) {
jo_mst.put("is_upload", "1");
jo_mst.put("upload_optid", SecurityUtils.getCurrentUserId());
jo_mst.put("upload_time", DateUtil.now());

4
lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java
View File

@@ -191,7 +191,7 @@ public class OutBillQueryServiceImpl implements OutBillQueryService {
Map<String, Object> mp = new LinkedHashMap<>();
mp.put("仓库", json.getString("stor_name"));
if (ObjectUtil.isNotEmpty(bill_type) && bill_type.equals("1004")){
if (ObjectUtil.isNotEmpty(bill_type) && "1004".equals(bill_type)){
mp.put("移入仓库", json.getString("in_stor_name"));
}
mp.put("库区", json.getString("sect_name"));
@@ -282,7 +282,7 @@ public class OutBillQueryServiceImpl implements OutBillQueryService {
Map<String, Object> mp = new LinkedHashMap<>();
mp.put("仓库", json.getString("stor_name"));
if (ObjectUtil.isNotEmpty(bill_type) && bill_type.equals("1004")){
if (ObjectUtil.isNotEmpty(bill_type) && "1004".equals(bill_type)){
mp.put("移入仓库", json.getString("in_stor_name"));
}
mp.put("库区", json.getString("sect_name"));