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

Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

Browse Source
dev_no_inv
yewj 9 months ago
parent f42eaebbb6 d23572b7cf
commit 5662dc31d6
5 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java
Unescape Escape View File

@ -109,7 +109,7 @@ public class IoCollectOriginController extends BaseController {
return baseResponse;
}else if (busType.contains("SC")) {
FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
filterOrderRequest.setStatus(7);
filterOrderRequest.setStatus(10);
filterOrderRequest.setAction(busType);
filterOrderRequest.setProductType(null);
filterOrderRequest.setLimit(collectOrderRequest.getLimit());

9
src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
Unescape Escape View File

@ -19,6 +19,7 @@ import com.glxp.api.entity.inout.IoCodeTempEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.exception.JsonException;
import com.glxp.api.http.ErpBasicClient;
import com.glxp.api.http.sync.SpGetHttpClient;
import com.glxp.api.req.collect.CollectOrderBizRequest;
import com.glxp.api.req.collect.CollectOrderRequest;
import com.glxp.api.req.collect.PostCollectOrderRequest;
@ -82,6 +83,9 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
@Resource
private ErpBasicClient erpBasicClient;
@Resource
private SpGetHttpClient spGetHttpClient;
public List<IoCollectOrderResponse> filterList(CollectOrderRequest collectOrderRequest) {
if (collectOrderRequest == null) {
@ -206,7 +210,12 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
//更新单据为已完成
IoOrderEntity orderEntity = orderService.findByBillNo(collectOrder.getBillNo());
orderEntity.setStatus(7);
orderEntity.setFromType(2);
orderEntity.setDealStatus(3);
orderEntity.setAuditTime(new Date());
orderService.update(orderEntity);
//推送自助平台
spGetHttpClient.updateCheckStatus(orderEntity,collectOrder.getCreateUser());
} else if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 0) {
//todo 根据单据类型上传医保或者第三方系统
PostCollectOrderRequest orderRequest = new PostCollectOrderRequest();

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

@ -36,6 +36,7 @@ import com.glxp.api.entity.thrsys.ThrSystemEntity;
import com.glxp.api.exception.JsonException;
import com.glxp.api.http.ErpBasicClient;
import com.glxp.api.http.HttpOkClient;
import com.glxp.api.http.sync.SpGetHttpClient;
import com.glxp.api.req.basic.FilterUdiRelRequest;
import com.glxp.api.req.collect.CollectOrderBizRequest;
import com.glxp.api.req.collect.CollectOrderRequest;
@ -139,6 +140,8 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
@Resource
IoCollectSetService collectSetService;
public IoCollectOrder getByBillNo(String billNo) {
return collectOrderMapper.selectOne(new LambdaQueryWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, billNo).last("limit 1"));
}
@ -259,11 +262,11 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
);
}
// TODO: 2024/10/14 下载本地单据类型
// TODO: 2024/10/14 下载本地单据类型
public BaseResponse importUdi(CollectOrderRequest collectOrderRequest) {
FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
filterOrderRequest.setStatus(7);
filterOrderRequest.setStatus(10);
filterOrderRequest.setAction(collectOrderRequest.getBusType());
filterOrderRequest.setProductType(null);
filterOrderRequest.setLimit(collectOrderRequest.getLimit());
@ -740,6 +743,9 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
//插入到码表
collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo());
//更新数据至第三方系统
//单据更新
ioCollectOrderBackupService.generateOrder(collectOrder.getBillNo());
// spGetHttpClient.updateCheckStatus(orderEntity,collectOrder.getCreateUser());
});
}

7
src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
Unescape Escape View File

@ -225,7 +225,12 @@ public class IoAddInoutService {
genOrderDetailCode(orderEntity, codeTempEntity);
}
}
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
if (orderEntity.getFromType().equals(ConstantStatus.FROM_UDISP)){
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
orderEntity.setDealStatus(ConstantStatus.ORDER_STATUS_CHECK);
}else {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
}
orderEntity.setUpdateTime(new Date());
orderEntity.setErrMsg("");
orderService.update(orderEntity);

7
src/main/java/com/glxp/api/service/sync/HeartService.java
Unescape Escape View File

@ -1516,12 +1516,15 @@ public class HeartService {
orderEntity.setFromType(ConstantStatus.FROM_UDISP);
orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_POST);
orderEntity.setOrderType(ConstantStatus.ORDER_TYPE_SCAN);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
//todo 单据备注没有传过来需要自助那边改掉
orderEntity.setId(null);
orderService.insertOrder(orderEntity);
insetOrderDb(syncDataResponse, orderEntity);
orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_TEMP_SAVE) {
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW){
addInoutService.dealProcess(orderEntity);
} else if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_TEMP_SAVE && orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
addInoutService.dealProcess(orderEntity);
orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) {

Write Preview
Loading…
Cancel
Save