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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-12-26 09:23:31 +08:00
parent b5c3184f11
commit 1b54fbacfe
15 changed files with 149 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java
View File

@@ -3,6 +3,7 @@ package org.nl.wms.ext.acs.rest;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaIgnore;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -32,6 +33,7 @@ public class AcsToWmsController {
@PostMapping("/status")
@Log("ACS给WMS反馈任务状态")
@ApiOperation("ACS给WMS反馈任务状态")
@SaIgnore
public ResponseEntity<Object> receiveTaskStatusAcs(@RequestBody String string) {
return new ResponseEntity<>(acsToWmsService.receiveTaskStatusAcs(string), HttpStatus.OK);
}
@@ -39,6 +41,7 @@ public class AcsToWmsController {
@PostMapping("/orderFinish")
@Log("ACS给WMS下发工单完成状态")
@ApiOperation("ACS给WMS下发工单完成状态")
@SaIgnore
public ResponseEntity<Object> orderFinish(@RequestBody String string) {
return new ResponseEntity<>(acsToWmsService.orderFinish(string), HttpStatus.OK);
}
@@ -47,6 +50,7 @@ public class AcsToWmsController {
@Log("申请任务")
@ApiOperation("申请任务")
@SaCheckPermission("menu:list")
@SaIgnore
public ResponseEntity<Object> apply(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(acsToWmsService.apply(whereJson), HttpStatus.OK);
}
@@ -55,6 +59,7 @@ public class AcsToWmsController {
@Log("二次申请任务")
@ApiOperation("二次申请任务")
@SaCheckPermission("menu:list")
@SaIgnore
public ResponseEntity<Object> againApply(@RequestBody String task_id) {
return new ResponseEntity<>(acsToWmsService.againApply(task_id), HttpStatus.OK);
}
@@ -62,6 +67,7 @@ public class AcsToWmsController {
@PostMapping("/deviceApply")
@Log("申请贴标、捆扎")
@ApiOperation("申请贴标、捆扎")
@SaIgnore
public ResponseEntity<Object> deviceApply(@RequestBody JSONObject jo) {
return new ResponseEntity<>(acsToWmsService.deviceApply(jo), HttpStatus.OK);
}
@@ -69,6 +75,7 @@ public class AcsToWmsController {
@PostMapping("/process")
@Log("RCS上报密集库任务异常处理")
@ApiOperation("RCS上报密集库任务异常处理")
@SaIgnore
public ResponseEntity<Object> process(@RequestBody JSONObject jo) {
return new ResponseEntity<>(acsToWmsService.process(jo), HttpStatus.OK);
}

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

@@ -15,6 +15,7 @@ import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.ext.acs.service.AcsToWmsService;
import org.nl.wms.log.LokiLog;
import org.nl.wms.log.LokiLogType;
import org.nl.wms.pda.mps.service.impl.BakingServiceImpl;
import org.nl.wms.pda.st.service.PrintService;
import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.sch.service.TaskService;
@@ -380,6 +381,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
result.put("box_width", box_width);
result.put("box_high", box_high);
result.put("bundle_times", 2);
} else if (type.equals("3")) {
//烘箱出箱任务
String device_code = whereJson.getString("device_code");
JSONObject bake_jo = new JSONObject();
bake_jo.put("point_code",device_code);
bake_jo.put("option","2");
new BakingServiceImpl().ovenInAndOut(bake_jo);
} else {
throw new BadRequestException("请输入正确的任务类型!");
}

13
lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/service/impl/CrmToLmsServiceImpl.java
View File

@@ -110,6 +110,9 @@ public class CrmToLmsServiceImpl implements CrmToLmsService {
String packageboxsn = jo.getString("packageboxsn");
String container_name = jo.getString("container_name");
String pcsn = jo.getString("pcsn");
String thickness = jo.getString("thickness");
String thickness_request = jo.getString("thickness_request");
String width_standard = jo.getString("width_standard");
HashMap map = new HashMap<>();
if (StrUtil.isNotEmpty(material_code)) {
@@ -154,6 +157,16 @@ public class CrmToLmsServiceImpl implements CrmToLmsService {
if (StrUtil.isNotEmpty(pcsn)) {
map.put("sap_pcsn", pcsn);
}
if (StrUtil.isNotEmpty(width_standard)) {
map.put("width_standard", width_standard);
}
if (StrUtil.isNotEmpty(thickness)) {
map.put("thickness", thickness);
}
if (StrUtil.isNotEmpty(thickness_request)) {
map.put("thickness_request", thickness_request);
}
//将查询条件带入，查询LMS成品库库存信息
JSONArray rows = WQL.getWO("QCRM_001").addParamMap(map).addParam("flag", "1").process().getResultJSONArray(0);

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

@@ -286,7 +286,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
JSONObject jo = new JSONObject();
jo.put("iContainerName",container_name);
jo.put("iisSourceRollDeliveryComplete",1);
jo.put("iPackageBoxSN",package_box_sn);
jo.put("PackageBoxSN",package_box_sn);
jo.put("iWarehouse",warehouse);
jo.put("iisAirSwellAssComplete","");
jo.put("iisAirSwellDeliveryComplete","");
@@ -446,8 +446,6 @@ public class LmsToMesServiceImpl implements LmsToMesService {
return result;
}
JSONArray list = new JSONArray();
// String url = acsUrl + api;
String url = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("MES_URL").getValue();
String api = "CamstarApi/ChildRollFGOutboundComplete";

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

@@ -111,7 +111,7 @@ public class SapToLmsServiceImpl implements SapToLmsService {
HashMap<String, JSONArray> mst_rows = new HashMap<>();
for (int i = 0; i < items.size(); i++) {
JSONObject dtl = items.getJSONObject(i);
String vbeln = dtl.getString(" ");
String vbeln = dtl.getString("VBELN");
if (mst_rows.containsKey(vbeln)) {
JSONArray objects = mst_rows.get(vbeln);
objects.add(dtl);

14
lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql
View File

@@ -24,7 +24,10 @@
输入.customerdescription TYPEAS s_string
输入.sap_pcsn TYPEAS s_string
输入.container_name TYPEAS s_string
输入.thickness TYPEAS s_string
输入.thickness_request TYPEAS s_string
输入.width TYPEAS f_string
输入.width_standard TYPEAS f_string
[临时表]
@@ -61,6 +64,8 @@
sub.date_of_FG_inbound AS dateoffginbound,
sub.package_box_sn AS packageboxsn,
sub.width,
sub.width_standard,
sub.thickness_request,
sub.thickness,
sub.net_weight AS netweight,
sub.length,
@@ -106,6 +111,15 @@
ENDOPTION
OPTION 输入.sap_pcsn <> ""
sub.sap_pcsn = 输入.sap_pcsn
ENDOPTION
OPTION 输入.width_standard <> ""
sub.width_standard >= 输入.width_standard
ENDOPTION
OPTION 输入.thickness <> ""
sub.thickness = 输入.thickness
ENDOPTION
OPTION 输入.thickness_request <> ""
sub.thickness_request = 输入.thickness_request
ENDOPTION
ENDSELECT
ENDQUERY

10
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql
View File

@@ -459,6 +459,16 @@
ENDQUERY
ENDIF
IF 输入.flag = "15"
QUERY
SELECT
point_code AS device_code
FROM
st_ivt_hotpointivt
ENDSELECT
ENDQUERY
ENDIF

BIN
lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls
View File

Binary file not shown.

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.wms.ext.acs.service.WmsToAcsService;
import org.springframework.stereotype.Component;
@@ -16,10 +17,11 @@ public class AutoQueryDeviceStatus{
private final WmsToAcsService wmsToAcsService;
public void run() {
//通过ACS接口获取温度
JSONObject jo = wmsToAcsService.getPointStatus(null);
JSONArray device_rows = jo.getJSONArray("device_rows");
for (int i = 0; i < device_rows.size(); i++) {
JSONObject row = device_rows.getJSONObject(i);
JSONArray device_rows = WQL.getWO("PDA_02").addParam("flag","15").process().getResultJSONArray(0);
JSONObject jo = wmsToAcsService.getPointStatus(device_rows);
JSONArray de_rows = jo.getJSONArray("data");
for (int i = 0; i < de_rows.size(); i++) {
JSONObject row = de_rows.getJSONObject(i);
String device_code = row.getString("device_code");
JSONObject point_jo = WQLObject.getWQLObject("st_ivt_hotpointivt").query("point_code = '"+device_code+"'").uniqueResult(0);
point_jo.put("temperature",row.getString("temperature"));

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

@@ -459,7 +459,8 @@ public class StorPublicServiceImpl implements StorPublicService {
map.put("inv_id", "");
map.put("inv_code", "");
map.put("point_status", "1");
if (!from.getString("is_free").equals("1") && StrUtil.isNotEmpty(storagevehicle_code)){
map.put("storagevehicle_code", "");
if (from.containsKey("is_free") && !from.getString("is_free").equals("1") && StrUtil.isNotEmpty(storagevehicle_code)) {
map.put("storagevehicle_code", storagevehicle_code);
map.put("storagevehicle_qty", "1");
map.put("vehicle_code", storagevehicle_code);

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

@@ -759,7 +759,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
JSONObject json = boxArr.getJSONObject(j);
JSONObject jsonBox = new JSONObject();
jsonBox.put("iPackageBoxSN", json.getString("box_no"));
jsonBox.put("PackageBoxSN", json.getString("box_no"));
paramArr.add(jsonBox);
}
paramMesMst.put("item", paramArr);

1
lms/nladmin-system/src/main/resources/log/LmsToMes.xml
View File

@@ -17,6 +17,7 @@
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>${log.charset}</charset>
</encoder>
</appender>

1
lms/nladmin-system/src/main/resources/log/LmsToSap.xml
View File

@@ -17,6 +17,7 @@
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>${log.charset}</charset>
</encoder>
</appender>

1
lms/nladmin-system/src/main/resources/log/MesToLms.xml
View File

@@ -17,6 +17,7 @@
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>${log.charset}</charset>
</encoder>
</appender>

1
lms/nladmin-system/src/main/resources/log/SapToLms.xml
View File

@@ -17,6 +17,7 @@
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>${log.charset}</charset>
</encoder>
</appender>