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

单据手动触发拉单，不根据配置，直接下载

Browse Source
dev_2.5_optimize
yewj 4 months ago
parent 553928b1ba
commit b9d1d81e4a
5 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File

24
src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
Unescape Escape View File

@ -224,6 +224,7 @@ public class IoCodeTempController extends BaseController {
collectOrderRequest.setBusType(addEnterCodeRequest.getBusType());
collectOrderRequest.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode());
collectOrderRequest.setBillNo(code);
collectOrderRequest.setForceAllot(true);
BaseResponse baseResponse = collectOriginService.downloadOrderV2(collectOrderRequest);
if (ResultEnum.SUCCESS.getCode() == baseResponse.getCode()) {
collectOrder = collectOrderService.unionSearch(null, null, code);
@ -3144,25 +3145,25 @@ public class IoCodeTempController extends BaseController {
@AuthRuleAnnotation("")
@PostMapping("/udiwms/warehouse/inout/deleteCode")
public BaseResponse deleteCode(@RequestBody FilterCodeRequest filterCodeRequest){
public BaseResponse deleteCode(@RequestBody FilterCodeRequest filterCodeRequest) {
// 已经做过校验了 所以 要上药队列 还是库存队列 的码 然后进行扣减库存 删码
IoCodeTempEntity ioCodeTemp = codeTempService.selectOone(filterCodeRequest);
if (ioCodeTemp != null){
if (ioCodeTemp != null) {
codeTempService.removeCodeById(ioCodeTemp);
return ResultVOUtils.success(processUdiAndReturnSuccess(filterCodeRequest));
}
IoSplitFifoCodeEntity ioSplitFifoCode = ioSplitFifoCodeService.selectOne(filterCodeRequest);
if (ioSplitFifoCode != null){
if (ioSplitFifoCode != null) {
ArrayList<String> codes = new ArrayList<>();
codes.add(ioSplitFifoCode.getCode());
ioSplitFifoInvService.removeByCodes(codes,filterCodeRequest.getWorkPlaceCode());
ioSplitFifoInvService.removeByCodes(codes, filterCodeRequest.getWorkPlaceCode());
return ResultVOUtils.success(processUdiAndReturnSuccess(filterCodeRequest));
}
//判断是上位队列 还是 库存
return ResultVOUtils.error(500,"追溯码不存在");
return ResultVOUtils.error(500, "追溯码不存在");
}
public AddEnterCodeResponse processUdiAndReturnSuccess(FilterCodeRequest filterCodeRequest){
public AddEnterCodeResponse processUdiAndReturnSuccess(FilterCodeRequest filterCodeRequest) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(filterCodeRequest.getCode());
UdiRelevanceResponse checkUdi = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
udiEntity.setCode(filterCodeRequest.getCode());
@ -3172,7 +3173,7 @@ public class IoCodeTempController extends BaseController {
@AuthRuleAnnotation("")
@PostMapping("/udiwms/warehouse/inout/deleteCodes")
public BaseResponse deleteCodes(@RequestBody FilterCodeRequest filterCodeRequest){
public BaseResponse deleteCodes(@RequestBody FilterCodeRequest filterCodeRequest) {
List<String> codeList = filterCodeRequest.getCodeList();
AddCodeResult addCodeResult = new AddCodeResult();
List<VailCodeResultResponse> vailCodeResultResponses = new ArrayList<>();
@ -3180,7 +3181,7 @@ public class IoCodeTempController extends BaseController {
VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse();
filterCodeRequest.setCode(code);
IoCodeTempEntity ioCodeTemp = codeTempService.selectOone(filterCodeRequest);
if (ioCodeTemp != null){
if (ioCodeTemp != null) {
codeTempService.removeCodeById(ioCodeTemp);
vailCodeResultResponse.setCode(code);
vailCodeResultResponse.setStatus(1);
@ -3189,10 +3190,10 @@ public class IoCodeTempController extends BaseController {
continue;
}
IoSplitFifoCodeEntity ioSplitFifoCode = ioSplitFifoCodeService.selectOne(filterCodeRequest);
if (ioSplitFifoCode != null){
if (ioSplitFifoCode != null) {
ArrayList<String> codes = new ArrayList<>();
codes.add(ioSplitFifoCode.getCode());
ioSplitFifoInvService.removeByCodes(codes,filterCodeRequest.getWorkPlaceCode());
ioSplitFifoInvService.removeByCodes(codes, filterCodeRequest.getWorkPlaceCode());
vailCodeResultResponse.setCode(code);
vailCodeResultResponse.setStatus(1);
vailCodeResultResponse.setErrMsg("正确");
@ -3210,7 +3211,7 @@ public class IoCodeTempController extends BaseController {
@AuthRuleAnnotation("")
@PostMapping("/udiwms/warehouse/inout/fallback")
public BaseResponse fallback(@RequestBody FilterCodeRequest filterCodeRequest){
public BaseResponse fallback(@RequestBody FilterCodeRequest filterCodeRequest) {
List<IoCodeTempEntity> codeList = codeTempService.selectListByGroupNumber(filterCodeRequest.getGroupNumber());
for (IoCodeTempEntity codeTempEntity : codeList) {
codeTempService.removeCodeById(codeTempEntity);
@ -3219,5 +3220,4 @@ public class IoCodeTempController extends BaseController {
}
}

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

@ -1384,7 +1384,7 @@ public class IoOrderController extends BaseController {
@GetMapping("/udiwms/inout/order/getProcessingOrder")
public BaseResponse getProcessingOrder(AddOrderRequest addOrderRequest) {
IoOrderResponse order = orderService.findByWorkPlaceCode(addOrderRequest.getWorkPlaceCode() + "",addOrderRequest.getWorkPlaceQueueCode(), getUserId());
IoOrderResponse order = orderService.findByWorkPlaceCode(addOrderRequest.getWorkPlaceCode() + "", addOrderRequest.getWorkPlaceQueueCode(), getUserId());
return ResultVOUtils.success(order);
}

5
src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
Unescape Escape View File

@ -159,5 +159,10 @@ public class CollectOrderRequest extends ListPageRequest {
private List<Integer> uploadStatusList;
/**
* 强制拉去单据转成待处理
*/
private Boolean forceAllot;
}

2
src/main/java/com/glxp/api/service/collect/DownloadFactory.java
Unescape Escape View File

@ -252,7 +252,7 @@ public class DownloadFactory {
ioCollectOrder.setBizList(bizList);
ioCollectOrderList.add(ioCollectOrder);
}
collectOrderService.importPrescribe(ioCollectOrderList, collectOrderRequest.getBusType());
collectOrderService.importPrescribe(ioCollectOrderList, collectOrderRequest );
return ResultVOUtils.success("下载成功");
}
return ResultVOUtils.error("下载失败");

8
src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
Unescape Escape View File

@ -640,11 +640,10 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
* 单据回填
*
* @param ioCollectOrderList
* @param addr
*/
@Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
public void importPrescribe(List<IoCollectOrder> ioCollectOrderList, String addr) {
public void importPrescribe(List<IoCollectOrder> ioCollectOrderList, CollectOrderRequest collectOrderRequest) {
String addr = collectOrderRequest.getBusType();
if (CollUtil.isNotEmpty(ioCollectOrderList)) {
//是否自动转成待处理单据
@ -689,7 +688,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
collectOrderBizOriginService.saveBatch(ioCollectOrderBizOrigins);
}
if (!collectOrder.getTagStatus().equals(4) && IntUtil.value(collectSet.getAutoDealOrder())) {//没出现耗材不匹配 且 开启了自动转成待处理单据
if (!collectOrder.getTagStatus().equals(4) && (IntUtil.value(collectSet.getAutoDealOrder()) || IntUtil.value(collectOrderRequest.getForceAllot()))) {//没出现耗材不匹配 且 开启了自动转成待处理单据
collectOrder.setTagStatus(1);
allotCollects.add(collectOrder);
allotCollectBizs.addAll(bizList);
@ -707,7 +706,6 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
boolean b = splitFifoCodeService.lockInventoryByOrder(collectOrder.getBillNo(), 1);
if (b && sysWorkplaceDocumentEntity.getAutoHandle()) {
//单据是否自动完成 是 调用 完成
CollectOrderRequest collectOrderRequest = new CollectOrderRequest();
AuthAdmin user = customerService.getUserBean();
collectOrderRequest.setUpdateUser(user.getId());
collectOrderRequest.setBusType(addr);

Write Preview
Loading…
Cancel
Save