UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev2.0' into dev2.0

Browse Source
dev2.0
郑明梁 2 years ago
parent d507470059 249edf57b8
commit 28e0ef79b7
6 changed files with 110 additions and 66 deletions
Show Stats Download Patch File Download Diff File

19
src/main/java/com/glxp/api/controller/inout/IoOrderController.java
Unescape Escape View File

@ -615,25 +615,6 @@ public class IoOrderController extends BaseController {
}
// List<IoCodeTempEntity> otherCodes = getOtherCode(billNo, codeEntities);
// for (IoCodeTempEntity codeTempEntity : otherCodes) {
// boolean isTure = false;
// for (IoCodeTempEntity codeEntity : codeEntities) {
// if (IntUtil.value(codeTempEntity.getId()) != IntUtil.value(codeEntity.getId())) {
// if (StrUtil.nullToEmpty(codeTempEntity.getBatchNo()).equals(StrUtil.nullToEmpty(codeEntity.getBatchNo()))) {
// codeEntity.setCheckStatus(2);
// isTure = true;
// }
// } else {
// if (IntUtil.value(codeTempEntity.getReCount()) != IntUtil.value(codeEntity.getReCount()) || isTure) {
// codeEntity.setCheckStatus(2);
// isTure = true;
// }
// }
// }
// if (!isTure)
// codeTempEntity.setCheckStatus(1);
// }
return codeEntities;
}

138
src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
Unescape Escape View File

@ -19,11 +19,9 @@ import com.glxp.api.entity.inout.IoCodeEntity;
import com.glxp.api.entity.inout.IoCodeTempEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.http.sync.SpGetHttpClient;
import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
import com.glxp.api.req.inout.ReviewFinishRequest;
import com.glxp.api.req.inout.ReviewSpmsRequest;
import com.glxp.api.req.inout.UpdateExportStatusRequest;
import com.glxp.api.req.inout.*;
import com.glxp.api.res.inout.AcceptOrderResponse;
import com.glxp.api.res.inout.IoCodeResponse;
import com.glxp.api.res.inout.IoOrderDetailResultResponse;
import com.glxp.api.res.inout.IoOrderResponse;
import com.glxp.api.res.sync.SpsSyncOrderResponse;
@ -63,6 +61,29 @@ public class IoOrderReviewController extends BaseController {
IoOrderService orderService;
@Resource
IoCheckInoutService ioCheckInoutService;
@Resource
IoCodeService codeService;
@Resource
IoCodeTempService codeTempService;
@Resource
UdiCalCountUtil calCountUtil;
@Resource
AuthAdminService authAdminService;
@Resource
EntrustReceService entrustReceService;
@Resource
IBasicBussinessTypeService basicBussinessTypeService;
@Resource
GennerOrderUtils gennerOrderUtils;
@Resource
IoAddInoutService addInoutService;
@Resource
HeartService heartService;
@Resource
SpGetHttpClient spGetHttp;
@Resource
InvBusUserService invBusUserService;
//获取验收单据业务详情
@AuthRuleAnnotation("")
@ -88,7 +109,9 @@ public class IoOrderReviewController extends BaseController {
}
//获取验收单据业务详情
/**
* 获取验收单据业务详情
*/
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/accept/getStatus")
public BaseResponse getStatus(String billNo) {
@ -169,14 +192,12 @@ public class IoOrderReviewController extends BaseController {
}
@Resource
IoCodeService codeService;
@Resource
IoCodeTempService codeTempService;
@Resource
UdiCalCountUtil calCountUtil;
//前端扫码验收
/**
* 前端扫码验收
*
* @param acceptOrderEntity
* @return
*/
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/order/accept/addCode")
public BaseResponse acceptAddCode(@RequestBody AcceptOrderResponse acceptOrderEntity) {
@ -231,14 +252,9 @@ public class IoOrderReviewController extends BaseController {
return ResultVOUtils.error(500, "非此单条码！");
}
@Resource
AuthAdminService authAdminService;
@Resource
EntrustReceService entrustReceService;
//手持终端验收完成后，更新订单状态
/**
* 手持终端验收完成后，更新订单状态
*/
@AuthRuleAnnotation("")
@PostMapping("/spms/inout/order/check/updateStatus")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
@ -279,14 +295,6 @@ public class IoOrderReviewController extends BaseController {
}
@Resource
IBasicBussinessTypeService basicBussinessTypeService;
@Resource
GennerOrderUtils gennerOrderUtils;
@Resource
SystemParamConfigService systemParamConfigService;
@Resource
IoAddInoutService addInoutService;
public void transferOrder(IoOrderEntity orderEntity, EntrustReceEntity entrustReceEntity) {
List<IoCodeEntity> warehouseEntities = codeService.findByOrderId(orderEntity.getBillNo());
@ -458,30 +466,23 @@ public class IoOrderReviewController extends BaseController {
}
@Resource
HeartService heartService;
@Resource
SpGetHttpClient spGetHttp;
// 新增扫码验收单，本地不存在拉去自助平台待验收单
/**
* 新增扫码验收单，本地不存在拉去自助平台待验收单
*/
@AuthRuleAnnotation("")
@PostMapping("/udiwms/order/reviewSpms")
public BaseResponse reviewSpms(@RequestBody ReviewSpmsRequest reviewSpmsRequest) {
String billNo = reviewSpmsRequest.getBillNo();
if (StrUtil.isEmpty(reviewSpmsRequest.getBillNo())) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
return ResultVOUtils.error(999, "请输入单据号!");
}
AcceptOrderResponse acceptOrderEntity = new AcceptOrderResponse();
Long userId = getUserId();
String errMsg = checkReviewAuth(billNo, userId + "");
EntrustReceEntity entrustReceEntity;
if (StrUtil.isNotEmpty(errMsg)) {
if (errMsg.equals("委托验收")) {
acceptOrderEntity.setEntrust(true);
// else return ResultVOUtils.error(500, "无权限验收！");
} else
return ResultVOUtils.error(500, errMsg);
}
@ -548,10 +549,13 @@ public class IoOrderReviewController extends BaseController {
}
@Resource
InvBusUserService invBusUserService;
//校验用户是否验收权限
/**
* 校验用户是否验收权限
*
* @param orderId
* @param userId
* @return
*/
private String checkReviewAuth(String orderId, String userId) {
IoOrderEntity orderEntity = orderService.findByBillNo(orderId);
if (orderEntity == null) {
@ -579,8 +583,56 @@ public class IoOrderReviewController extends BaseController {
} else {
return null;
}
}
//pda获取核对单据
/**
* PDA获取待核对单据
*/
@AuthRuleAnnotation("")
@GetMapping("/udiwms/pda/order/check/getOrder")
public BaseResponse getPdaCheckOrder(PdaCheckRequest pdaCheckRequest) {
IoOrderResponse orderEntity = orderService.findGroupBillNo(pdaCheckRequest.getBillNo());
if (orderEntity == null) {
return ResultVOUtils.error(500, "单据不存在！");
}
boolean isExit = invBusUserService.exitBus(getUserId() + "", pdaCheckRequest.getAction());
if (!isExit) {
return ResultVOUtils.error(500, "无验收权限！");
}
return ResultVOUtils.success(orderEntity);
}
/**
* PDA获取待核对单据-单据详情
*/
@AuthRuleAnnotation("")
@GetMapping("/udiwms/pda/order/check/getOrderDetail")
public BaseResponse getPdaCheckOrderDetail(PdaCheckRequest pdaCheckRequest) {
FilterOrderDetailResultRequest filterOrderDetailResultRequest = new FilterOrderDetailResultRequest();
filterOrderDetailResultRequest.setOrderIdFk(pdaCheckRequest.getBillNo());
List<IoOrderDetailResultResponse> orderDetailResultResponses = orderDetailResultService.filterList(filterOrderDetailResultRequest);
return ResultVOUtils.success(orderDetailResultResponses);
}
/**
* PDA获取待核对单据-单据条码明细
*/
@AuthRuleAnnotation("")
@GetMapping("/udiwms/pda/order/check/getOrderDetail")
public BaseResponse getPdaCheckOrderCodes(PdaCheckRequest pdaCheckRequest) {
FilterOrderDetailResultRequest filterOrderDetailResultRequest = new FilterOrderDetailResultRequest();
filterOrderDetailResultRequest.setOrderIdFk(pdaCheckRequest.getBillNo());
FilterCodeRequest filterCodeRequest = new FilterCodeRequest();
filterCodeRequest.setOrderId(pdaCheckRequest.getBillNo());
List<IoCodeResponse> codeResponses = codeService.filterList(filterCodeRequest);
return ResultVOUtils.success(codeResponses);
}
}

12
src/main/java/com/glxp/api/req/inout/PdaCheckRequest.java
Unescape Escape View File

@ -0,0 +1,12 @@
package com.glxp.api.req.inout;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
@Data
public class PdaCheckRequest {
@NotEmpty(message = "单据号不能为空")
private String billNo;
private String action;
}

1
src/main/java/com/glxp/api/req/inout/ReviewSpmsRequest.java
Unescape Escape View File

@ -6,5 +6,6 @@ import lombok.Data;
public class ReviewSpmsRequest {
private String billNo;
private String action;
}

2
src/main/java/com/glxp/api/service/sync/WebSocketComponent.java
Unescape Escape View File

@ -58,6 +58,8 @@ public class WebSocketComponent implements CommandLineRunner {
if (message.equals(SocketMsgType.DL_ALL_DATA)) {
heartTaskService.pullData();
}
Thread.sleep(500);
//打印服务端返回的数据
log.info("成功获取数据：" + message);
}

4
src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java
Unescape Escape View File

@ -14,10 +14,6 @@ public class UdiCalCountUtil {
UdiRelevanceService udiRelevanceService;
// public int getActCount(Long relId) {
// UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(relId);
// return getActCount(udiRelevanceResponse);
// }
public int getActCount(UdiRelevanceResponse udiRelevanceResponse) {
//启用使用单元

Write Preview
Loading…
Cancel
Save