1、增加签到字段

2、校验码是和下级所有码否传过了逻辑还没写
dev_unify
qiuyt 8 months ago
parent d8ac8c152e
commit 59818217ce

@ -38,6 +38,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
@ -276,7 +277,7 @@ public class ErpBasicClient {
*/
public BaseResponse<BasicSkPrescribeResponse> postOrder(PostCollectOrderRequest postOrderRequest) {
ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(postOrderRequest.getThirdSys());
String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/yb/postOrder";
String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/uploadCollectOrder";
try {
String response = httpOkClient.uCloudPost(url, postOrderRequest);
if (StrUtil.isEmpty(response)) {
@ -486,5 +487,11 @@ public class ErpBasicClient {
return ResultVOUtils.error(500, "连接第三方系统接口服务出错");
}
}
//TODO 阿超改==校验码是和下级所有码否传过了逻辑还没写
/**
*
*/
public BaseResponse<List> collectOrderCheckCode(List<String> codeList) {
return ResultVOUtils.success(new ArrayList<>());
}
}

@ -24,6 +24,7 @@ import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity;
import com.glxp.api.entity.collect.*;
import com.glxp.api.entity.inout.IoCodeTempEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.system.SystemParamConfigEntity;
import com.glxp.api.exception.JsonException;
import com.glxp.api.http.ErpBasicClient;
import com.glxp.api.http.sync.SpGetHttpClient;
@ -41,6 +42,7 @@ import com.glxp.api.service.basic.UdiRlSupService;
import com.glxp.api.service.inout.IoAddInoutService;
import com.glxp.api.service.inout.IoCheckInoutService;
import com.glxp.api.service.inout.IoOrderService;
import com.glxp.api.service.system.SystemParamConfigService;
import com.glxp.api.util.*;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
@ -101,7 +103,8 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
@Value("${WEB_TITLE}")
private String WEB_TITLE;
@Resource
SystemParamConfigService systemParamConfigService;
public List<IoCollectOrderResponse> filterList(CollectOrderRequest collectOrderRequest) {
if (collectOrderRequest == null) {
return Collections.emptyList();
@ -163,6 +166,7 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
public void generateOrder(String billNo,AuthAdmin authAdmin) {
IoCollectOrderBackup collectOrder = getByBillNo(billNo);
SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByWorkplaceCode(collectOrder.getWorkPlaceCode(), collectOrder.getBusType());
//1.内部系统,且单据为扫码生成业务单则创建系统单据
if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 1 && sysWorkplaceDocumentEntity.getScanType() == 1) {

@ -4718,3 +4718,6 @@ CALL Pro_Temp_ColumnWork('rel_code_batch', 'erpId',
CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'relId',
' bigint DEFAULT NULL COMMENT ''产品属性id''',
1);
CALL Pro_Temp_ColumnWork('thr_yb_setup', 'signData',
'char(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''签到时间''',
1);

Loading…
Cancel
Save