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

rev:代码规范

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-12-14 09:28:19 +08:00
parent d1be5733b8
commit 793f8c9cfe
40 changed files with 38 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,11 +130,6 @@ public class SectattrServiceImpl implements SectattrService {
throw new BadRequestException("被删除或无权限，操作失败!");
}
/* String sect_code = dto.getSect_code();
SectattrDto sectattrDto = this.findByCode(sect_code);
if (sectattrDto != null && !dto.getSect_id().equals(sectattrDto.getSect_id()) && sectattrDto.getIs_delete().equals("0")) {
throw new BadRequestException("存在相同的库区编号");
}*/
String sect_code = dto.getSect_code();
WQLObject tab = WQLObject.getWQLObject("st_ivt_sectattr");

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

@@ -322,7 +322,7 @@ public class StructivtServiceImpl implements StructivtService {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void save(JSONObject whereJson) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("remark", whereJson.getString("remark"));

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

@@ -136,7 +136,6 @@ public class UserStorServiceImpl implements UserStorService {
HashMap<String, String> map = new HashMap<>();
map.put("flag", "2");
map.put("stor_id", stor_jo.getString("stor_id"));
// map.put("sect_type_attr", (String) whereJson.get("sect_type_attr"));
JSONArray ja = WQL.getWO("QST_SECT_ATTR").addParamMap(map).process().getResultJSONArray(0);
if (ja.size() > 0) {
JSONArray sect_ja = new JSONArray();

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

@@ -195,56 +195,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
result.put("message", "下发成功，但未连接ACS!");
result.put("data", new JSONArray());
/* // 测试数据
JSONArray data = result.getJSONArray("data");
JSONObject a = new JSONObject();
a.put("electricity", "30");
a.put("status_name", "空闲");
a.put("car_no", "1");
a.put("task_code", "");
a.put("fault", "");
data.add(a);
JSONObject b = new JSONObject();
b.put("electricity", "13");
b.put("status_name", "执行中");
b.put("car_no", "2");
b.put("task_code", "000001");
b.put("fault", "取货失败");
data.add(b);
JSONObject c = new JSONObject();
c.put("electricity", "100");
c.put("status_name", "充电中");
c.put("car_no", "3");
c.put("task_code", "000002");
c.put("fault", "");
data.add(c);
JSONObject nowJson = new JSONObject(); // 返回数据
JSONArray ArrA1 = new JSONArray(); // A1车间
JSONArray ArrLk = new JSONArray(); // LK车间
String run_time = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("AGV_RUN_TIME").getValue();
for (int i = 0; i < data.size(); i++) {
JSONObject json = data.getJSONObject(i);
// 工作时长：电量百分比*6
String electricity = json.getString("electricity");
json.put("run_time", NumberUtil.round(NumberUtil.div(NumberUtil.mul(electricity, run_time),100), 1));
if ("2,3".contains(json.getString("car_no"))) {
ArrA1.add(json);
}
if ("1".contains(json.getString("car_no"))) {
ArrLk.add(json);
}
}
nowJson.put("jsonA1",ArrA1);
nowJson.put("jsonLK",ArrLk);
result.put("data", nowJson);*/
return result;
}
@@ -337,16 +287,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
String car_no = whereJson.getString("car_no");
JSONObject jsonParam = new JSONObject();
/*if ("2,3,4,5".contains(car_no)) {
jsonParam.put("agv_system", "2");
} else if ("1".contains(car_no)) {
jsonParam.put("agv_system", "1");
jsonParam.put("car_no", car_no);
} else if ("6,7,8,9".contains(car_no)) {
jsonParam.put("agv_system", "3");
jsonParam.put("car_no", car_no);
}*/
if ("1".contains(car_no)) {
jsonParam.put("agv_system", "1");
jsonParam.put("car_no", car_no);

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

@@ -35,8 +35,6 @@ public class LmsToMesServiceImpl implements LmsToMesService {
@Override
public JSONObject momRollFoilWeighing(JSONObject param) {
log.info("momRollFoilWeighing接口输入参数为：-------------------" + param);
System.out.println("momRollFoilWeighing接口输入参数为：-------------------" + param);
JSONObject result = new JSONObject();
if (StrUtil.equals("0", is_connect_mes)) {
@@ -52,7 +50,6 @@ public class LmsToMesServiceImpl implements LmsToMesService {
param.put("UserName", UserName);
param.put("Password", Password);
// String url = acsUrl + api;
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_URL").getValue();
String api = "";
url = url + api;
@@ -112,9 +109,6 @@ public class LmsToMesServiceImpl implements LmsToMesService {
return result;
}
JSONArray list = new JSONArray();
// String url = acsUrl + api;
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_URL").getValue();
String api = "CamstarApi/MomRollBakeInBound";
url = url + api;
@@ -178,7 +172,6 @@ public class LmsToMesServiceImpl implements LmsToMesService {
param.put("UserName", UserName);
param.put("Password", Password);
// String url = acsUrl + api;
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_URL").getValue();
String api = "CamstarApi/MomRollBakeOutBound";
url = url + api;
@@ -221,7 +214,6 @@ public class LmsToMesServiceImpl implements LmsToMesService {
JSONArray list = new JSONArray();
// String url = acsUrl + api;
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_URL").getValue();
String api = "CamstarApi/MomRollSemiFGInboundComplete";
url = url + api;
@@ -276,7 +268,6 @@ public class LmsToMesServiceImpl implements LmsToMesService {
jo.put("Attribute1", 1);
}
// String url = acsUrl + api;
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_URL").getValue();
String api = "CamstarApi/AirSwellWithPaperTubeAssComplete";
url = url + api;
@@ -335,7 +326,6 @@ public class LmsToMesServiceImpl implements LmsToMesService {
jo.put("UserName", UserName);
jo.put("Password", Password);
// String url = acsUrl + api;
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_URL").getValue();
String api = "CamstarApi/CutPlanMomRollDeliveryComplete";
url = url + api;
@@ -386,7 +376,6 @@ public class LmsToMesServiceImpl implements LmsToMesService {
jo.put("iContainerName", container_name);
jo.put("iisAirSwellDeliveryComplete", 1);
// String url = acsUrl + api;
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_URL").getValue();
String api = "CamstarApi/AirSwellWithPaperTubeAssArrival";
url = url + api;
@@ -442,7 +431,6 @@ public class LmsToMesServiceImpl implements LmsToMesService {
jo.put("UserName", UserName);
jo.put("Password", Password);
// String url = acsUrl + api;
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_URL").getValue();
String api = "CamstarApi/ChildRollFGInboundComplete";
url = url + api;
@@ -485,7 +473,6 @@ public class LmsToMesServiceImpl implements LmsToMesService {
return result;
}
// String url = acsUrl + api;
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_URL").getValue();
String api = "CamstarApi/ChildRollFGOutboundComplete";
url = url + api;
@@ -527,7 +514,6 @@ public class LmsToMesServiceImpl implements LmsToMesService {
return result;
}
// String url = acsUrl + api;
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_URL").getValue();
String api = "CamstarApi/LMSUnPackage";
url = url + api;
@@ -575,7 +561,6 @@ public class LmsToMesServiceImpl implements LmsToMesService {
return result;
}
// String url = acsUrl + api;
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_URL").getValue();
String api = "CamstarApi/LMSPackage";
url = url + api;
@@ -617,7 +602,6 @@ public class LmsToMesServiceImpl implements LmsToMesService {
return result;
}
// String url = acsUrl + api;
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("FEISHU_URL").getValue();
String api = "/FeiShuNoticesWebApi/CreateApproval";
url = url + api;
@@ -654,7 +638,6 @@ public class LmsToMesServiceImpl implements LmsToMesService {
return result;
}
// String url = acsUrl + api;
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("FEISHU_URL").getValue();
String api = "/FeiShuNoticesWebApi/SendCard";
url = url + api;

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

@@ -136,14 +136,12 @@ public class MesToLmsServiceImpl implements MesToLmsService {
result.put("RTMSG", "操作成功!");
result.put("RTOAL", 1);
result.put("RTDAT", null);
System.out.println(result);
} catch (Exception e) {
// 返回失败
result.put("RTYPE", "E");
result.put("RTMSG", "操作失败!" + e.getMessage());
result.put("RTOAL", 0);
result.put("RTDAT", null);
System.out.println(result);
}
log.info("momRollFoilStart接口输出参数为：-------------------" + result.toString());
return result;
@@ -188,13 +186,11 @@ public class MesToLmsServiceImpl implements MesToLmsService {
result.put("RTMSG", "操作成功!");
result.put("RTOAL", 1);
result.put("RTDAT", arr);
System.out.println(result);
} catch (Exception e) {
result.put("RTYPE", "E");
result.put("RTMSG", "操作失败!" + e.getMessage());
result.put("RTOAL", 0);
result.put("RTDAT", null);
System.out.println(result);
}
log.info("momRollFoilStart接口输出参数为：-------------------" + result.toString());
return result;
@@ -213,7 +209,6 @@ public class MesToLmsServiceImpl implements MesToLmsService {
JSONObject result = new JSONObject();
WQLObject sbTab = WQLObject.getWQLObject("st_ivt_sbpointivt"); // 生箔点位库存表
WQLObject rawTab = WQLObject.getWQLObject("PDM_BI_RawFoilWorkOrder"); // 生箔工单表
try {
String containerName = param.getString("ContainerName");
@@ -263,7 +258,6 @@ public class MesToLmsServiceImpl implements MesToLmsService {
result.put("RTMSG", "操作失败!" + e.getMessage());
result.put("RTOAL", 0);
result.put("RTDAT", null);
System.out.println(result);
}
log.info("momRollFoilComplete接口输出参数为：-------------------" + result.toString());
return result;
@@ -585,13 +579,11 @@ public class MesToLmsServiceImpl implements MesToLmsService {
result.put("RTMSG", "操作成功!");
result.put("RTOAL", 1);
result.put("RTDAT", null);
System.out.println(result);
} catch (Exception e) {
result.put("RTYPE", "E");
result.put("RTMSG", "操作失败!" + e.getMessage());
result.put("RTOAL", 0);
result.put("RTDAT", null);
System.out.println(result);
}
log.info("cutPlanTransfer接口输出参数为：-------------------" + result.toString());
return result;
@@ -636,7 +628,6 @@ public class MesToLmsServiceImpl implements MesToLmsService {
result.put("RTMSG", "操作成功!");
result.put("RTOAL", 1);
result.put("RTDAT", null);
System.out.println(result);
return result;
}
@@ -782,13 +773,11 @@ public class MesToLmsServiceImpl implements MesToLmsService {
result.put("RTMSG", "操作成功!");
result.put("RTOAL", 1);
result.put("RTDAT", null);
System.out.println(result);
} catch (Exception e) {
result.put("RTYPE", "E");
result.put("RTMSG", "操作失败!" + e.getMessage());
result.put("RTOAL", 0);
result.put("RTDAT", null);
System.out.println(result);
}
log.info("callNextAssAndMomRoll接口输出参数为：-------------------" + result.toString());
return result;
@@ -1040,10 +1029,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
JSONObject result = new JSONObject();
try {
// String is_mesTolms = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_mesTolms").getValue();
// if (StrUtil.equals(is_mesTolms, "1")) {
String isUnPlanProductionBox = param.getString("isUnPlanProductionBox"); // 是否计划外子卷
String QuanlityInBox = param.getString("QuanlityInBox"); // 产品编码
String QualityGuaranPeriod = param.getString("QualityGuaranPeriod"); // 保质期
String ProductName = param.getString("ProductName"); // 来源卷位置
@@ -1165,13 +1151,11 @@ public class MesToLmsServiceImpl implements MesToLmsService {
result.put("RTMSG", "操作成功!");
result.put("RTOAL", 1);
result.put("RTDAT", null);
System.out.println(result);
} catch (Exception e) {
result.put("RTYPE", "E");
result.put("RTMSG", "操作失败!" + e.getMessage());
result.put("RTOAL", 0);
result.put("RTDAT", null);
System.out.println(result);
}
log.info("childRollPackComplete接口输出参数为：-------------------" + result.toString());
return result;
@@ -1189,8 +1173,6 @@ public class MesToLmsServiceImpl implements MesToLmsService {
log.info("inventoryTransferInfoSync接口输入参数为：-------------------" + param.toString());
JSONObject result = new JSONObject();
// String is_mesTolms = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_mesTolms").getValue();
// if (StrUtil.equals(is_mesTolms, "1")) {
try {
JSONArray rows = param.getJSONArray("details");
String SaleOrderItem = param.getString("SaleOrderItem");
@@ -1319,14 +1301,11 @@ public class MesToLmsServiceImpl implements MesToLmsService {
result.put("RTMSG", "操作成功!");
result.put("RTOAL", 1);
result.put("RTDAT", null);
System.out.println(result);
} catch (Exception e) {
result.put("RTYPE", "E");
result.put("RTMSG", "操作失败!，" + e.getMessage());
result.put("RTOAL", 0);
result.put("RTDAT", null);
System.out.println(result);
}
// }
log.info("inventoryTransferInfoSync接口输出参数为：-------------------" + result.toString());
@@ -1346,51 +1325,32 @@ public class MesToLmsServiceImpl implements MesToLmsService {
JSONObject result = new JSONObject();
try {
// String is_mesTolms = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_mesTolms").getValue();
// if (StrUtil.equals(is_mesTolms, "1")) {
String ContainerName = param.getString("ContainerName");
String SaleOrderName = param.getString("SaleOrderName");
String isUnPlanProduction = param.getString("isUnPlanProduction");
String sale_order_description = param.getString("Attribute1");
if ("1".equals(isUnPlanProduction)) {
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
JSONObject sub_jo = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("container_name = '" + ContainerName + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(sub_jo)) {
throw new BadRequestException("子卷包装不存在：" + ContainerName);
}
/*sub_jo.put("change_type_scode","02");
sub_jo.put("create_id",currentUserId);
sub_jo.put("create_name",nickName);
sub_jo.put("change_time",DateUtil.now());
sub_jo.put("workorder_id",IdUtil.getSnowflake(1, 1).nextId() + "");
WQLObject.getWQLObject("PDM_BI_SubPackageRelationChangeFlow").insert(sub_jo);*/
sub_jo.put("sale_order_name", SaleOrderName);
sub_jo.put("sale_order_description", sale_order_description);
WQLObject.getWQLObject("pdm_bi_subpackagerelation").update(sub_jo);
/*JSONObject new_sub = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("container_name = '"+ContainerName+"' AND status = '2'").uniqueResult(0);
new_sub.put("change_type_scode","01");
new_sub.put("create_id",currentUserId);
new_sub.put("create_name",nickName);
new_sub.put("change_time",DateUtil.now());
new_sub.put("workorder_id",IdUtil.getSnowflake(1, 1).nextId() + "");
WQLObject.getWQLObject("PDM_BI_SubPackageRelationChangeFlow").insert(new_sub);*/
}
result.put("RTYPE", "S");
result.put("RTMSG", "操作成功!");
result.put("RTOAL", 1);
result.put("RTDAT", null);
System.out.println(result);
// }
} catch (Exception e) {
result.put("RTYPE", "E");
result.put("RTMSG", "操作失败!，" + e.getMessage());
result.put("RTOAL", 0);
result.put("RTDAT", null);
System.out.println(result);
}
log.info("childRollInfoUpdate接口输出参数为：-------------------" + result.toString());
@@ -1428,13 +1388,11 @@ public class MesToLmsServiceImpl implements MesToLmsService {
result.put("RTMSG", "操作成功!");
result.put("RTOAL", 1);
result.put("RTDAT", null);
System.out.println(result);
} catch (Exception e) {
result.put("RTYPE", "E");
result.put("RTMSG", "操作失败!，" + e.getMessage());
result.put("RTOAL", 0);
result.put("RTDAT", null);
System.out.println(result);
}
log.info("childRollInfoUpdate接口输出参数为：-------------------" + result.toString());
@@ -1477,13 +1435,10 @@ public class MesToLmsServiceImpl implements MesToLmsService {
resultParam.put("RTYPE", "S");
resultParam.put("Code", "0");
resultParam.put("RTMSG", "操作成功!");
System.out.println(resultParam);
} catch (Exception e) {
resultParam.put("RTYPE", "E");
resultParam.put("Code", "1");
resultParam.put("RTMSG", "操作失败!，" + e.getMessage());
System.out.println(resultParam);
}
log.info("sendAuditResult接口输出参数为：-------------------" + resultParam.toString());

5
lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/LmsToSapServiceImpl.java
View File

@@ -48,7 +48,6 @@ public class LmsToSapServiceImpl implements LmsToSapService {
return result;
}
// String url = acsUrl + api;
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_URL").getValue();
String token = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_TOKEN").getValue();
String sap_client = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_CLIENT").getValue();
@@ -111,9 +110,6 @@ public class LmsToSapServiceImpl implements LmsToSapService {
return result;
}
JSONArray list = new JSONArray();
// String url = acsUrl + api;
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_URL").getValue();
String token = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_TOKEN").getValue();
String sap_client = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_CLIENT").getValue();
@@ -155,7 +151,6 @@ public class LmsToSapServiceImpl implements LmsToSapService {
JSONArray list = new JSONArray();
// String url = acsUrl + api;
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_URL").getValue();
String token = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_TOKEN").getValue();
String sap_client = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_CLIENT").getValue();

1
lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java
View File

@@ -492,7 +492,6 @@ public class SapToLmsServiceImpl implements SapToLmsService {
String iostorinv_id = checkOutBillService.insertDtl2(jsonMst);
JSONObject jsonObject = new JSONObject();
jsonObject.put("iostorinv_id", iostorinv_id);
//checkOutBillService.allDiv(jsonObject);
}
if (StrUtil.equals(lfart, "ZLR")) {
jsonMst.put("tableData", box_rows);

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

@@ -56,8 +56,6 @@ public class BakingServiceImpl implements BakingService {
@Transactional(rollbackFor = Exception.class)
public JSONObject ovenInAndOut(JSONObject whereJson) {
//RedisUtils redisUtils = SpringContextHolder.getBean(RedisUtils.class);
String option = whereJson.getString("option"); // 1-入箱 2-出箱
WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); // 点位表
@@ -128,8 +126,6 @@ public class BakingServiceImpl implements BakingService {
jsonMap.put("flag", "1");
jsonMap.put("product_area", jsonPointZc.getString("product_area"));
//获取温度幅度
/*jsonMap.put("min_temperature", (NumberUtil.sub(temperature, temperature_lose)).toString());
jsonMap.put("max_temperature", (NumberUtil.add(temperature, temperature_lose)).toString());*/
jsonMap.put("point_location", jsonPointZc.getString("point_location"));
JSONArray hot_rows = WQL.getWO("PDA_BAKING_01").addParamMap(jsonMap).process().getResultJSONArray(0);
JSONObject jsonHotIvt = new JSONObject();
@@ -183,7 +179,6 @@ public class BakingServiceImpl implements BakingService {
*/
// 1.根据冷却区此母卷的点位找到对应的暂存区、找到空位
// JSONObject jsonCoolIvt = coolIvtTab.query("container_name ='" + container_name + "' and is_used = '1' and full_point_status = '02' and cool_ivt_status = '01'").uniqueResult(0);
JSONObject jsonCoolIvt = coolIvtTab.query("full_point_code = '" + point_code1 + "' and is_used = '1'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonCoolIvt)) {
throw new BadRequestException("请扫描正确的冷却区或对接点位！");
@@ -235,8 +230,6 @@ public class BakingServiceImpl implements BakingService {
JSONObject jsonMap = new JSONObject();
jsonMap.put("flag", "1");
jsonMap.put("product_area", product_area);
/*jsonMap.put("min_temperature", NumberUtil.sub(temperature, temperature_lose) + "");
jsonMap.put("max_temperature", NumberUtil.add(temperature, temperature_lose) + "");*/
jsonMap.put("point_location", map.getString("point_location"));
JSONArray hot_rows = WQL.getWO("PDA_BAKING_01").addParamMap(jsonMap).process().getResultJSONArray(0);
JSONObject jsonHotIvt = new JSONObject();
@@ -515,16 +508,6 @@ public class BakingServiceImpl implements BakingService {
InCoolIvtTask inCoolIvtTask = new InCoolIvtTask();
String task_id = inCoolIvtTask.createTask(param);
/* // 4.插入明细
JSONObject jsonHotMst = hotMstTab.query("container_name = '" + container_name + "' and is_delete = '0' and bill_status <> '50'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonHotMst)) throw new BadRequestException("烘烤区出入主表不存在");
JSONObject hotParam = new JSONObject();
hotParam.put("task_id", task_id);
hotParam.put("iostorinv_id", jsonHotMst.getString("iostorinv_id"));
hotParam.put("start_point_code", point_code1);
hotParam.put("next_point_code", jsonCooIvt.getString("full_point_code"));
this.createHotDtl(hotParam);*/
// 生成冷却区出入表
String currentUserId = SecurityUtils.getCurrentUserId();
String currentUsername = SecurityUtils.getCurrentUsername();
@@ -564,7 +547,7 @@ public class BakingServiceImpl implements BakingService {
return result;
}
@Transactional
@Transactional(rollbackFor = Exception.class)
public String createHotIoMst(JSONObject param) {
/*
* 创建烘箱区出入主表

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

@@ -39,7 +39,7 @@ public class HandleBakingServiceImpl implements HandleBakingService {
* 1.第二条任务出现异常后 如何再次触发
*/
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public JSONObject ovenInAndOut(JSONObject whereJson) {
String option = whereJson.getString("option"); // 1-入箱 2-出箱
@@ -284,7 +284,7 @@ public class HandleBakingServiceImpl implements HandleBakingService {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public JSONObject checkConfirm(JSONObject whereJson) {
String point_code = whereJson.getString("point_code");
String container_name = whereJson.getString("container_name");
@@ -330,7 +330,7 @@ public class HandleBakingServiceImpl implements HandleBakingService {
return result;
}
@Transactional
@Transactional(rollbackFor = Exception.class)
public String createHotIoMst(JSONObject param) {
/*
* 创建烘箱区出入主表

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

@@ -62,11 +62,6 @@ public class RawFoilServiceImpl implements RawFoilService {
map.put("in_area_id", in_area_id);
}
/*// 如果都为空则默认区域为 A1
if (ObjectUtil.isEmpty(point_code) && ObjectUtil.isEmpty(container_name) && ObjectUtil.isEmpty(product_area)) {
map.put("product_area", "A1");
}*/
JSONObject arr = WQL.getWO("PDA_RAWFOIL_01").addParamMap(map).pageQuery(ctx, "container_name");
JSONArray rows = arr.getJSONArray("content");
for (int i = 0; i < rows.size(); i++) {
@@ -274,7 +269,6 @@ public class RawFoilServiceImpl implements RawFoilService {
JSONObject task_jo = WQLObject.getWQLObject("SCH_BASE_Task").query("material_code = '" + container_name + "' and task_status <> '07' AND is_delete = '0'").uniqueResult(0);
// 查询生箔点位库存表
// JSONObject jsonSb = sbTab.query("ext_code = '" + jsonRaw.getString("resource_name") + "'and is_used = '1'").uniqueResult(0);
JSONObject jsonSb = sbTab.query("ext_code = '" + jsonRaw.getString("resource_name") + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonSb)) {
throw new BadRequestException("点位不存在");
@@ -321,7 +315,6 @@ public class RawFoilServiceImpl implements RawFoilService {
JSONObject task_jo = WQLObject.getWQLObject("SCH_BASE_Task").query("material_code = '" + container_name + "' and task_status <> '07' AND is_delete = '0'").uniqueResult(0);
// 查询生箔点位库存表
// JSONObject jsonSb = WQLObject.getWQLObject("st_ivt_sbpointivt").query("ext_code = '" + jsonRaw.getString("resource_name") + "'and is_used = '1'").uniqueResult(0);
JSONObject jsonSb = WQLObject.getWQLObject("st_ivt_sbpointivt").query("ext_code = '" + jsonRaw.getString("resource_name") + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonSb)) {
throw new BadRequestException("点位不存在");

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

@@ -78,27 +78,6 @@ public class CoolInServiceImpl implements CoolInService {
if (ObjectUtil.isNotEmpty(task_jo)) {
throw new BadRequestException("该点位存在未完成的任务，不允许绑定！");
}
/* // 插入冷却区出入库单据
JSONObject jsonCool = new JSONObject();
jsonCool.put("iostorinv_id", IdUtil.getSnowflake(1,1).nextId());
jsonCool.put("bill_code", CodeUtil.getNewCode("COOLREGION_BILL_CODE"));
jsonCool.put("io_type", "0");
jsonCool.put("material_id", "");
jsonCool.put("pcsn", "");
jsonCool.put("bill_status", "50");
jsonCool.put("start_point_code", raw_jo.getString("resource_name"));
jsonCool.put("end_point_code", point_code);
jsonCool.put("create_mode", "03");
jsonCool.put("create_id", currentUserId);
jsonCool.put("create_name", currentUsername);
jsonCool.put("create_time", DateUtil.now());
jsonCool.put("update_optid", currentUserId);
jsonCool.put("update_optname", currentUsername);
jsonCool.put("update_time", DateUtil.now());
jsonCool.put("confirm_optid", currentUserId);
jsonCool.put("confirm_optname", currentUsername);
jsonCool.put("confirm_time", DateUtil.now());
coolIvtTab.insert(jsonCool);*/
// 校验母卷号是否已存在
JSONObject json = coolIvtTab.query("container_name = '" + raw_jo.getString("container_name") + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(json)) {

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

@@ -111,12 +111,6 @@ public class ProductInstorServiceImpl implements ProductInstorService {
HashMap<String, String> map = new HashMap<>();
map.put("box_no", box_no);
/*if (option.equals("3")) {
HashMap<String, String> sub_map = new HashMap<>();
sub_map.put("box_type", material_code);
//如果是退货入库要更新子卷包装关系的木箱料号
WQLObject.getWQLObject("pdm_bi_subpackagerelation").update(sub_map, "package_box_SN = '" + box_no + "'");
}*/
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();

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

@@ -117,16 +117,7 @@ public class VirtualOutServiceImpl implements VirtualOutService {
throw new BadRequestException("木箱不能为空");
}
/* for (int i = 0; i < box_rows.size(); i++) {
JSONObject json = box_rows.getJSONObject(i);
if (!StrUtil.equals(json.getString("package_box_sn"), box_no)) {
throw new BadRequestException("请输入正确的木箱号");
}
}*/
// 传单据号
JSONArray disArr = WQL.getWO("PDA_ST_01").addParam("flag", "7").addParam("box_no", box_no).process().getResultJSONArray(0);
if (ObjectUtil.isEmpty(disArr)) {
throw new BadRequestException("木箱码无效");

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

@@ -152,11 +152,6 @@ public class SubpackagerelationServiceImpl implements SubpackagerelationService
}
WQLObject wo = WQLObject.getWQLObject("pdm_bi_subpackagerelation");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
//判断包装关系状态，只能修改状态为生成的
String status = json.getString("status");
/*if (!StrUtil.equals(status,"0")){
throw new BadRequestException("只能修改状态为生成的包装关系！");
}*/
wo.update(json);
}
@@ -172,9 +167,6 @@ public class SubpackagerelationServiceImpl implements SubpackagerelationService
JSONObject param = new JSONObject();
param.put("workorder_id", String.valueOf(workorder_id));
param.put("is_delete", "1");
// param.put("update_optid", currentUserId);
// param.put("update_optname", nickName);
// param.put("update_time", now);
wo.update(param);
}
}

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

@@ -320,7 +320,7 @@ public class PointServiceImpl implements PointService {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void sync() {
WQLObject wo = WQLObject.getWQLObject("sch_base_point");

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

@@ -67,7 +67,7 @@ public class CallEmpReelTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void updateTaskStatus(JSONObject taskObj, String status) {
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表
WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_CoolPointIvt"); // 冷却区库存表
@@ -246,7 +246,7 @@ public class CallEmpReelTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public String createTask(JSONObject form) {
WQLObject tab = WQLObject.getWQLObject("SCH_BASE_Task");
String currentUserId = SecurityUtils.getCurrentUserId();
@@ -306,7 +306,7 @@ public class CallEmpReelTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void forceFinish(String task_id) {
JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());

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

@@ -69,7 +69,7 @@ public class CoolCutTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void updateTaskStatus(JSONObject taskObj, String status) {
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_CoolRegionIO");
@@ -258,7 +258,7 @@ public class CoolCutTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public String createTask(JSONObject form) {
WQLObject tab = WQLObject.getWQLObject("SCH_BASE_Task");
String currentUserId = SecurityUtils.getCurrentUserId();
@@ -317,7 +317,7 @@ public class CoolCutTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void forceFinish(String task_id) {
JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());

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

@@ -72,7 +72,7 @@ public class CutConveyorTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void updateTaskStatus(JSONObject taskObj, String status) {
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_DeliveryPointIvt");
@@ -148,11 +148,6 @@ public class CutConveyorTask extends AbstractAcsTask {
throw new BadRequestException("未找到可用点位:" + point_code1);
}
/*// 更新分切输送库存状态
jsonIvt.put("point_status", "01");
jsonIvt.put("qzzno", "");
ivtTab.update(jsonIvt);*/
//判断输送出来的任务起点是否属于上料位，如果属于上料位且对应的缓存位存在载具且不存在任务进行载具横移
char dtl_type = point_code1.charAt(point_code1.length() - 1);
if (Integer.valueOf(String.valueOf(dtl_type)) % 2 != 0) {
@@ -348,7 +343,7 @@ public class CutConveyorTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public String createTask(JSONObject form) {
WQLObject tab = WQLObject.getWQLObject("SCH_BASE_Task");
String currentUserId = SecurityUtils.getCurrentUserId();
@@ -356,8 +351,6 @@ public class CutConveyorTask extends AbstractAcsTask {
String point_code1 = form.getString("point_code1");
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 (!"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 + "存在未完成的任务！");
@@ -396,7 +389,7 @@ public class CutConveyorTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void forceFinish(String task_id) {
JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());

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

@@ -77,7 +77,7 @@ public class CutTrussTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void updateTaskStatus(JSONObject taskObj, String status) {
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
CutConveyorTask cutConveyorTask = new CutConveyorTask();
@@ -355,7 +355,7 @@ public class CutTrussTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public String createTask(JSONObject form) {
WQLObject tab = WQLObject.getWQLObject("SCH_BASE_Task");
String currentUserId = SecurityUtils.getCurrentUserId();
@@ -451,7 +451,7 @@ public class CutTrussTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void forceFinish(String task_id) {
JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());

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

@@ -65,7 +65,7 @@ public class InCoolIvtTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void updateTaskStatus(JSONObject taskObj, String status) {
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表
WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); // 点位表
@@ -174,7 +174,7 @@ public class InCoolIvtTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public String createTask(JSONObject form) {
WQLObject tab = WQLObject.getWQLObject("SCH_BASE_Task");
CutConveyorTask cutConveyorTask = new CutConveyorTask();
@@ -221,7 +221,7 @@ public class InCoolIvtTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void forceFinish(String task_id) {
JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());

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

@@ -71,7 +71,7 @@ public class InHotTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void updateTaskStatus(JSONObject taskObj, String status) {
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表
WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); // 点位表
@@ -228,7 +228,7 @@ public class InHotTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public String createTask(JSONObject form) {
WQLObject tab = WQLObject.getWQLObject("SCH_BASE_Task");
@@ -330,7 +330,7 @@ public class InHotTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void forceFinish(String task_id) {
JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());

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

@@ -62,7 +62,7 @@ public class OutHotTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void updateTaskStatus(JSONObject taskObj, String status) {
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表
WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); // 点位表
@@ -167,7 +167,7 @@ public class OutHotTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public String createTask(JSONObject form) {
WQLObject tab = WQLObject.getWQLObject("SCH_BASE_Task");
CutConveyorTask cutConveyorTask = new CutConveyorTask();
@@ -212,7 +212,7 @@ public class OutHotTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void forceFinish(String task_id) {
JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());

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

@@ -83,7 +83,7 @@ public class SendOutTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void updateTaskStatus(JSONObject taskObj, String status) {
WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表
WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); // 点位表
@@ -143,7 +143,7 @@ public class SendOutTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public String createTask(JSONObject form) {
WQLObject tab = WQLObject.getWQLObject("SCH_BASE_Task");
CutConveyorTask cutConveyorTask = new CutConveyorTask();
@@ -182,7 +182,7 @@ public class SendOutTask extends AbstractAcsTask {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void forceFinish(String task_id) {
JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0);
this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode());

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

@@ -268,7 +268,6 @@ public class InchargeServiceImpl implements InchargeService {
jsonOutDtl.put("qty_unit_name", json.getString("qty_unit_name"));
jsonOutDtl.put("plan_qty", json.getDoubleValue("plan_qty"));
jsonOutDtl.put("source_billdtl_id", json.getLongValue("iostorinvdtl_id"));
// jsonOutDtl.put("source_bill_code", jsonInMst.getString("bill_code"));
jsonOutDtl.put("assign_qty", json.getDoubleValue("assign_qty"));
jsonOutDtl.put("unassign_qty", json.getDoubleValue("unassign_qty"));
jsonOutDtl.put("vbeln", json.getString("vbeln"));

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

@@ -95,7 +95,7 @@ public class OutChargeServiceImpl implements OutChargeService {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void charge(Map whereJson) {
WQLObject dtl_wql = WQLObject.getWQLObject("st_ivt_iostorinvdtl");
WQLObject mst_wql = WQLObject.getWQLObject("ST_IVT_IOStorInv");

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

@@ -575,12 +575,6 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
dis_map.put("work_status", "01");
}
if (StrUtil.isNotEmpty(ios_dis.getString("point_id")) && !is_virtual) {
// Boolean transfer = whereJson2.getBoolean("transfer",false);
Boolean transfer = whereJson2.getBoolean("transfer");
if (ObjectUtil.isEmpty(transfer)) {
transfer = false;
}
//创建任务并下发
InTask task = new InTask();
JSONObject task_form = new JSONObject();
@@ -664,7 +658,7 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
@SneakyThrows
public void allDivStruct(JSONObject form) {
String iostorinv_id = form.getString("iostorinv_id");

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

@@ -217,7 +217,6 @@ public class StorPublicServiceImpl implements StorPublicService {
}
// 获取仓位物料信息
// JSONObject jo_in = wql.query(sql_where.toString()).uniqueResult(0);
JSONObject jo_in = WQL.getWO("QST_IVT_STORPUBLIC").addParamMap(map).process().uniqueResult(0);
switch (change_type_scode) {
case "11": //11加冻结、减可用：出库分配、移库移出

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

@@ -123,7 +123,6 @@ public class ChangeServiceImpl implements ChangeService {
mst_jo.put("bill_type", "2002");
mst_jo.put("biz_date", DateUtil.today());
// JSONObject stor = WQLObject.getWQLObject("st_ivt_bsrealstorattr").query("is_delete = '0' AND is_used = '1' AND is_productstore = '1'").uniqueResult(0);
mst_jo.put("stor_id", MapUtil.getStr(map, "stor_id"));
mst_jo.put("stor_code", MapUtil.getStr(map, "stor_code"));
mst_jo.put("stor_name", MapUtil.getStr(map, "stor_name"));
@@ -631,10 +630,8 @@ public class ChangeServiceImpl implements ChangeService {
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
// OutTask checkOutBillAcsTask = new OutTask();
String task_id = whereJson.getString("task_id");
String taskdtl_id = whereJson.getString("taskdtl_id");
// JSONObject result = checkOutBillAcsTask.notifyAcs(taskdtl_id);
JSONObject result = null;
if (ObjectUtil.isNotEmpty(result)) {
String status = result.getString("status");

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

@@ -84,21 +84,6 @@ public class CheckServiceImpl implements CheckService {
json.put("pcsn_num", pcsn_num);
}
/* for (int i = 0; i < content.size(); i++) {
int pcsn_num = 0;
JSONObject jsonObject = content.getJSONObject(i);
JSONArray dtlArr = dtlTab.query("check_id = '" + jsonObject.getString("check_id") + "'").getResultJSONArray(0);
for (int j = 0; j < dtlArr.size(); j++) {
JSONObject json = dtlArr.getJSONObject(j);
JSONArray boxNum = WQL.getWO("QST_IVT_CHECK").addParam("flag", "12").addParam("storagevehicle_code", json.getString("storagevehicle_code")).process().getResultJSONArray(0);
pcsn_num += boxNum.size();
}
jsonObject.put("pcsn_num",pcsn_num);
}*/
return jo;
}
@@ -653,9 +638,7 @@ public class CheckServiceImpl implements CheckService {
mapMst.put("sect_name", ja_sun.getJSONObject(0).getString("sect_name"));
mapMst.put("struct_id", ja_sun.getJSONObject(0).getString("struct_id"));
mapMst.put("struct_name", ja_sun.getJSONObject(0).getString("struct_name"));
//List<HashMap> rows_sun = ja_sun.toJavaList(HashMap.class);
mapMst.put("tableData", ja_sun);
//moreOrLessService.insertDtl(mapMst);
}
//判断是否要生成溢单
@@ -675,9 +658,7 @@ public class CheckServiceImpl implements CheckService {
mapMst.put("sect_name", ja_yi.getJSONObject(0).getString("sect_name"));
mapMst.put("struct_id", ja_yi.getJSONObject(0).getString("struct_id"));
mapMst.put("struct_name", ja_yi.getJSONObject(0).getString("struct_name"));
//List<HashMap> rows_yi = ja_yi.toJavaList(HashMap.class);
mapMst.put("tableData", ja_yi);
//moreOrLessService.insertDtl(mapMst);
}
JSONArray ja = wo_dtl.query("status in ('99','07') and check_id='" + form.getString("check_id") + "'").getResultJSONArray(0);
@@ -707,7 +688,6 @@ public class CheckServiceImpl implements CheckService {
.getResultJSONArray(0);
for (int i = 0; i < ja_sunyi.size(); i++) {
JSONObject jo = ja_sunyi.getJSONObject(i);
//moreOrLessService.confirm(jo);
}
}
wo_mst.update(jo_mst);
@@ -733,7 +713,6 @@ public class CheckServiceImpl implements CheckService {
String storagevehicle_code = jo.getString("storagevehicle_code");
JSONObject jsonSub = subTab.query("package_box_sn = '" + storagevehicle_code + "'").uniqueResult(0);
// if (ObjectUtil.isEmpty(jsonSub)) throw new BadRequestException("此木箱没有子卷包装关系："+storagevehicle_code);
Map<String, Object> map = new LinkedHashMap<>();
String status = jo.getString("status");

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

@@ -968,10 +968,8 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
// OutTask checkOutBillAcsTask = new OutTask();
String task_id = whereJson.getString("task_id");
String taskdtl_id = whereJson.getString("taskdtl_id");
// JSONObject result = checkOutBillAcsTask.notifyAcs(taskdtl_id);
JSONObject result = null;
if (ObjectUtil.isNotEmpty(result)) {
String status = result.getString("status");

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

@@ -132,7 +132,6 @@ public class RecutPlanServiceImpl implements RecutPlanService {
jsonDtl.put("seq_no", i);
jsonDtl.put("material_id", json.getLongValue("material_id"));
jsonDtl.put("pcsn", json.getString("sap_pcsn"));
//jsonDtl.put("package_box_sn", json.getString("storagevehicle_code"));
jsonDtl.put("qty_unit_id", json.getString("qty_unit_id"));
jsonDtl.put("qty_unit_name", json.getString("qty_unit_name"));
jsonDtl.put("qty", json.getDoubleValue("qty"));

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

@@ -208,7 +208,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
@Transactional(rollbackFor = Exception.class)
public void insertDtlByJson(JSONObject map) {
//明细另一种写法
//JSONArray jsonArr = JSONArray.fromObject(whereJson.get("tableData"));
JSONArray rows = map.getJSONArray("tableData");
map.remove("tableData");
String currentUserId = SecurityUtils.getCurrentUserId();
@@ -252,7 +251,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
public String insertDtl(JSONObject map) {
WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt");
//明细另一种写法
//JSONArray jsonArr = JSONArray.fromObject(whereJson.get("tableData"));
JSONArray array = map.getJSONArray("tableData");
JSONArray rows = new JSONArray();
// 过滤相同箱号的明细
@@ -266,7 +264,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
}
}
if (ObjectUtil.isNotEmpty(boxSet)) {
// rows.clear();
// 遍历
for (String box_no : boxSet) {
JSONObject jsonObject = WQL.getWO("QST_IVT_CHECKOUTBILL").addParam("flag", "77").addParam("box_no", box_no).process().uniqueResult(0);
@@ -414,7 +411,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
public String insertDtl2(JSONObject map) {
WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt");
//明细另一种写法
//JSONArray jsonArr = JSONArray.fromObject(whereJson.get("tableData"));
JSONArray rows = map.getJSONArray("tableData");
map.remove("tableData");
@@ -800,7 +796,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
}
}
if (ObjectUtil.isNotEmpty(boxSet)) {
// rows.clear();
// 遍历
for (String box_no : boxSet) {
JSONObject jsonObject = WQL.getWO("QST_IVT_CHECKOUTBILL").addParam("flag", "77").addParam("box_no", box_no).process().uniqueResult(0);
@@ -989,9 +984,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
if (unassign_qty >= canuse_qty) {
unassign_qty = NumberUtil.sub(unassign_qty, canuse_qty);
// ivt.put("change_qty", canuse_qty + "");
} else {
// ivt.put("change_qty", unassign_qty + "");
unassign_qty = 0;
}
@@ -1230,9 +1223,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
if (unassign_qty >= canuse_qty) {
unassign_qty = unassign_qty - canuse_qty;
// ivt.put("change_qty", canuse_qty + "");
} else {
// ivt.put("change_qty", unassign_qty + "");
unassign_qty = 0;
}

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

@@ -217,11 +217,8 @@ public class RegionioOutServiceImpl implements RegionioOutService {
form.put("create_mode", jsonIn.getString("create_mode"));
form.put("pcsn", jsonIn.getString("pcsn"));
form.put("iostorinv_id", iostorinv_id);
/* CallMaterialTask callMaterialTask = new CallMaterialTask();
String task_id = callMaterialTask.createTask(form);*/
JSONObject json = new JSONObject();
// json.put("task_id", task_id);
json.put("update_optid", SecurityUtils.getCurrentUserId());
json.put("update_optname", SecurityUtils.getCurrentNickName());
json.put("update_time", DateUtil.now());

4
lms/nladmin-system/src/main/java/org/nl/wms/statistics/rest/IostordailyController.java → lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/IostordailyController.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.statistics.rest;
package org.nl.wms.stat.rest;
import io.swagger.annotations.Api;
@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.logging.annotation.Log;
import org.nl.wms.statistics.service.IostordailyService;
import org.nl.wms.stat.service.impl.IostordailyService;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

2
lms/nladmin-system/src/main/java/org/nl/wms/statistics/service/dto/IostordailyDto.java → lms/nladmin-system/src/main/java/org/nl/wms/stat/service/dto/IostordailyDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.wms.statistics.service.dto;
package org.nl.wms.stat.service.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

2
lms/nladmin-system/src/main/java/org/nl/wms/statistics/service/IostordailyService.java → lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/IostordailyService.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.statistics.service;
package org.nl.wms.stat.service.impl;
import com.alibaba.fastjson.JSONArray;
import org.springframework.data.domain.Pageable;

3
lms/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IostordailyServiceImpl.java → lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/IostordailyServiceImpl.java
View File

@@ -1,5 +1,5 @@
package org.nl.wms.statistics.service.impl;
package org.nl.wms.stat.service.impl;
import cn.hutool.core.map.MapUtil;
@@ -14,7 +14,6 @@ import org.nl.modules.wql.util.WqlUtil;
import org.nl.wms.basedata.master.service.ClassstandardService;
import org.nl.wms.basedata.master.service.MaterialbaseService;
import org.nl.wms.basedata.st.service.impl.UserStorServiceImpl;
import org.nl.wms.statistics.service.IostordailyService;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;

0
lms/nladmin-system/src/main/java/org/nl/wms/statistics/wql/SendReceiveQuery.wql → lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/SendReceiveQuery.wql
View File