中继服务同步设置

master
anthonyywj2 3 years ago
parent f9dc799455
commit 0c29008d38

@ -500,6 +500,7 @@ public class UdiRelevanceController {
filterSysEntityList.add(new FilterSysEntity(i + 3, "未对照" + basicThirdSysEntities.get(i).getThirdName()));
}
}
filterSysEntityList.add(new FilterSysEntity(10, "最新同步"));
PageInfo<FilterSysEntity> pageInfo;
pageInfo = new PageInfo<>(filterSysEntityList);
PageSimpleResponse<FilterSysEntity> pageSimpleResponse = new PageSimpleResponse<>();

@ -61,14 +61,6 @@ public class CompanyProductRelevanceController {
List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
companyProductRelevanceRequest.setDiType(1);
basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
// if (basicInstrumentMaintainRelevanceResponses != null && basicInstrumentMaintainRelevanceResponses.size() > 0) {
// for (CompanyProductRelevanceResponse basicInstrumentMaintainRelevanceResponse : basicInstrumentMaintainRelevanceResponses) {
// if (basicInstrumentMaintainRelevanceResponse.getDiType() == 2 && basicInstrumentMaintainRelevanceResponse.getIsUseDy() != 1) {
// basicInstrumentMaintainRelevanceResponse.setNameCode(basicInstrumentMaintainRelevanceResponse.getSjcpbm());
// }
// }
// }
PageInfo<CompanyProductRelevanceResponse> pageInfo;
pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);
PageSimpleResponse<CompanyProductRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();

@ -0,0 +1,43 @@
package com.glxp.api.admin.controller.info;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.entity.info.SyncDataSetEntity;
import com.glxp.api.admin.service.info.SyncDataSetService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
@RestController
public class SyncDataSetController {
@Resource
private SyncDataSetService syncDataSetService;
@AuthRuleAnnotation("system/param/syncData/config")
@GetMapping("/system/param/syncData/config")
public BaseResponse list() {
return ResultVOUtils.success(syncDataSetService.selectSet());
}
@AuthRuleAnnotation("system/param/syncData/save")
@PostMapping("/system/param/syncData/save")
public BaseResponse save(@RequestBody @Valid SyncDataSetEntity syncDataSetEntity
) {
boolean b = syncDataSetService.insert(syncDataSetEntity);
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
return ResultVOUtils.success();
}
}

@ -57,55 +57,58 @@ public class CheckOrderUtils {
filterUdiInfoRequest.setNameCode(myErpOrder.getNameCode());
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(myErpOrder.getBindRlFk());
for (ErpOrderEntity vailOrderEntity : vailOrderEntities) {
if (checkId(vailOrderEntity, udiRelevanceResponse, bussinessTypeEntity) == null
&& checkBatchNo(vailOrderEntity, myErpOrder) == null
&& checkProductDate(vailOrderEntity, myErpOrder) == null
&& checkExpireDate(vailOrderEntity, myErpOrder) == null
&& checkWarehouse(vailOrderEntity, myErpOrder) == null
&& checkCount(vailOrderEntity, myErpOrder) == null
) {
myErpOrder.setErpOrderId(vailOrderEntity.getErpOrderId());
myErpOrder.setErpCount(vailOrderEntity.getErpCount());
myErpOrder.setReCount(vailOrderEntity.getReCount());
myErpOrder.setGoodsname(vailOrderEntity.getGoodsname());
myErpOrder.setGoodsid(vailOrderEntity.getGoodsid());
myErpOrder.setStatus("success");
vailOrderEntity.setStatus("success");
orderDetailService.updateErpOrder(myErpOrder);
break;
} else {
errMsg = checkBatchNo(vailOrderEntity, myErpOrder);
if (errMsg == null) {
errMsg = checkId(vailOrderEntity, udiRelevanceResponse, bussinessTypeEntity);
if(!vailOrderEntity.isCheckSuccess()){
if (checkId(vailOrderEntity, udiRelevanceResponse, bussinessTypeEntity) == null
&& checkBatchNo(vailOrderEntity, myErpOrder) == null
&& checkProductDate(vailOrderEntity, myErpOrder) == null
&& checkExpireDate(vailOrderEntity, myErpOrder) == null
&& checkWarehouse(vailOrderEntity, myErpOrder) == null
&& checkCount(vailOrderEntity, myErpOrder) == null
) {
myErpOrder.setErpOrderId(vailOrderEntity.getErpOrderId());
myErpOrder.setErpCount(vailOrderEntity.getErpCount());
myErpOrder.setReCount(vailOrderEntity.getReCount());
myErpOrder.setGoodsname(vailOrderEntity.getGoodsname());
myErpOrder.setGoodsid(vailOrderEntity.getGoodsid());
myErpOrder.setStatus("success");
vailOrderEntity.setStatus("success");
vailOrderEntity.setCheckSuccess(true);
orderDetailService.updateErpOrder(myErpOrder);
break;
} else {
errMsg = checkBatchNo(vailOrderEntity, myErpOrder);
if (errMsg == null) {
errMsg = checkProductDate(vailOrderEntity, myErpOrder);
errMsg = checkId(vailOrderEntity, udiRelevanceResponse, bussinessTypeEntity);
if (errMsg == null) {
errMsg = checkExpireDate(vailOrderEntity, myErpOrder);
errMsg = checkProductDate(vailOrderEntity, myErpOrder);
if (errMsg == null) {
errMsg = checkWarehouse(vailOrderEntity, myErpOrder);
errMsg = checkExpireDate(vailOrderEntity, myErpOrder);
if (errMsg == null) {
errMsg = checkCount(vailOrderEntity, myErpOrder);
if (errMsg != null) {
myErpOrder.setErpCount(vailOrderEntity.getErpCount());
myErpOrder.setReCount(vailOrderEntity.getReCount());
myErpOrder.setGoodsname(vailOrderEntity.getGoodsname());
myErpOrder.setGoodsid(vailOrderEntity.getGoodsid());
myErpOrder.setStatus("fail");
vailOrderEntity.setStatus("fail");
orderDetailService.updateErpOrder(myErpOrder);
break;
errMsg = checkWarehouse(vailOrderEntity, myErpOrder);
if (errMsg == null) {
errMsg = checkCount(vailOrderEntity, myErpOrder);
if (errMsg != null) {
myErpOrder.setErpCount(vailOrderEntity.getErpCount());
myErpOrder.setReCount(vailOrderEntity.getReCount());
myErpOrder.setGoodsname(vailOrderEntity.getGoodsname());
myErpOrder.setGoodsid(vailOrderEntity.getGoodsid());
myErpOrder.setStatus("fail");
vailOrderEntity.setStatus("fail");
orderDetailService.updateErpOrder(myErpOrder);
break;
}
}
}
}
}
}
}
}
}
}
}

@ -0,0 +1,11 @@
package com.glxp.api.admin.dao.info;
import com.glxp.api.admin.entity.info.SyncDataSetEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface SyncDataSetDao {
SyncDataSetEntity selectSet();
boolean insert(SyncDataSetEntity syncDataSetEntity);
}

@ -0,0 +1,23 @@
package com.glxp.api.admin.entity.info;
import lombok.Data;
@Data
public class SyncDataSetEntity {
private Integer id;
private boolean typeBus;
private boolean typeScan;
private boolean typeThird;
private boolean basicProducts;
private boolean basicCorp;
private boolean basicInv;
private boolean basicThirdProducts;
private boolean basicThirdCorp;
private boolean basicThirdInv;
private boolean basicThirdBusOrder;
private boolean orderScanFinish;
private boolean dbDiProducts;
private boolean downstreamEnable;
private Integer syncTime; //定时上传时间
private Integer syncDonwloadTime; //定时下载时间
}

@ -56,6 +56,8 @@ public class ErpOrderEntity {
private String invoiceDate;
private BigDecimal price;
private boolean checkSuccess;
public Integer getBindStatus() {
if (bindStatus == null)

@ -4,7 +4,7 @@ import java.util.Date;
public class StockPrinttREntity {
private int id;
private Integer id;
private String udiRlIdFk;
private String udiCode;
private String nameCode;
@ -33,11 +33,11 @@ public class StockPrinttREntity {
private Date updateTime;
public int getId() {
public Integer getId() {
return id;
}
public void setId(int id) {
public void setId(Integer id) {
this.id = id;
}

@ -43,22 +43,27 @@ public class SyncUdiService {
&& StrUtil.isEmpty(productInfoFilterRequest.getNameCode())
&& StrUtil.isEmpty(productInfoFilterRequest.getGgxh())
&& StrUtil.isEmpty(productInfoFilterRequest.getUuid())
&& StrUtil.isEmpty(productInfoFilterRequest.getZczbhhzbapzbh()))
&& StrUtil.isEmpty(productInfoFilterRequest.getZczbhhzbapzbh())) {
if (productInfoFilterRequest.getNameCode() != null && !productInfoFilterRequest.getNameCode().equals("") && productInfoFilterRequest.getNameCode().length() < 10) {
return ResultVOUtils.error(500, "请输入完整的最小销售单元标识!");
}
if (productInfoFilterRequest.getYlqxzcrbarmc() != null && !productInfoFilterRequest.getYlqxzcrbarmc().equals("") && productInfoFilterRequest.getYlqxzcrbarmc().length() < 4) {
return ResultVOUtils.error(500, "请输入完整的医疗器械注册备案人名称!");
}
if ((productInfoFilterRequest.getYlqxzcrbarmc() == null || productInfoFilterRequest.getYlqxzcrbarmc().equals(""))
&& (productInfoFilterRequest.getNameCode() == null || productInfoFilterRequest.getNameCode().equals(""))
&& (productInfoFilterRequest.getCpmctymc() == null || productInfoFilterRequest.getCpmctymc().equals(""))
if (StrUtil.isEmpty(productInfoFilterRequest.getYlqxzcrbarmc()) && StrUtil.isEmpty(productInfoFilterRequest.getNameCode())) {
if (StrUtil.isNotEmpty(productInfoFilterRequest.getCpmctymc())) {
return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称");
}
if (productInfoFilterRequest.getGgxh() != null && !productInfoFilterRequest.getGgxh().equals("")) {
return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称");
}
if (productInfoFilterRequest.getZczbhhzbapzbh() != null && !productInfoFilterRequest.getZczbhhzbapzbh().equals("")) {
return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称");
}
}
if (
StrUtil.isEmpty(productInfoFilterRequest.getYlqxzcrbarmc())
&& (productInfoFilterRequest.getNameCode() == null || productInfoFilterRequest.getNameCode().equals(""))
&& (productInfoFilterRequest.getCpmctymc() == null || productInfoFilterRequest.getCpmctymc().equals(""))
) {
if (productInfoFilterRequest.getGgxh() != null && !productInfoFilterRequest.getGgxh().equals("")) {
return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称");
@ -68,9 +73,6 @@ public class SyncUdiService {
}
}
// if (productInfoFilterRequest.getCpmctymc() != null && !productInfoFilterRequest.getCpmctymc().equals("")) {
// return ResultVOUtils.error(500, "请输入完整的产品通用名称!");
// }
productInfoFilterRequest.setIsNewest(1);
productInfoFilterRequest.setDiType("1");
List<ProductInfoEntity> productInfoEntityList = productInfoService.filterUdi(productInfoFilterRequest);

@ -0,0 +1,11 @@
package com.glxp.api.admin.service.info;
import com.glxp.api.admin.entity.info.SyncDataSetEntity;
public interface SyncDataSetService {
SyncDataSetEntity selectSet();
boolean insert(SyncDataSetEntity syncDataSetEntity);
}

@ -0,0 +1,25 @@
package com.glxp.api.admin.service.info.impl;
import com.glxp.api.admin.dao.info.SyncDataSetDao;
import com.glxp.api.admin.entity.info.SyncDataSetEntity;
import com.glxp.api.admin.service.info.SyncDataSetService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@Service
public class SyncDataSetServiceImpl implements SyncDataSetService {
@Resource
SyncDataSetDao syncDataSetDao;
@Override
public SyncDataSetEntity selectSet() {
return syncDataSetDao.selectSet();
}
@Override
public boolean insert(SyncDataSetEntity syncDataSetEntity) {
return syncDataSetDao.insert(syncDataSetEntity);
}
}

@ -71,62 +71,6 @@ public class DlBasicService {
RedisUtil redisUtil;
private static final Logger logger = LoggerFactory.getLogger(DlBasicService.class);
public void dlBasicUdiInfo() {
BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.BASIC_UDI + "");
List<BasicExportStatusEntity> pageSimpleResponse = baseResponse.getData();
if (pageSimpleResponse != null) {
List<BasicExportStatusEntity> basicExportStatusEntities = pageSimpleResponse;
if (basicExportStatusEntities != null && basicExportStatusEntities.size() > 0) {
for (BasicExportStatusEntity basicExportStatusEntity : basicExportStatusEntities) {
String datas = spGetHttp.getBasicData(basicExportStatusEntity.getId(), BasicProcessStatus.BASIC_UDI);
BaseResponse<UdiRelevanceExportJsonResponse> udiRelevanceExportJsonResponse = JSONObject.parseObject(datas, new TypeReference<BaseResponse<UdiRelevanceExportJsonResponse>>() {
});
udiInfoImportDetailService.importJsonData(udiRelevanceExportJsonResponse.getData());
spGetHttp.postBasicStatus(basicExportStatusEntity.getId());
}
}
}
}
public void dlBasicCorp() {
BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.BASIC_CORP + "");
List<BasicExportStatusEntity> pageSimpleResponse = baseResponse.getData();
if (pageSimpleResponse != null) {
List<BasicExportStatusEntity> basicExportStatusEntities = pageSimpleResponse;
if (basicExportStatusEntities != null && basicExportStatusEntities.size() > 0) {
for (BasicExportStatusEntity basicExportStatusEntity : basicExportStatusEntities) {
String datas = spGetHttp.getBasicData(basicExportStatusEntity.getId(), BasicProcessStatus.BASIC_CORP);
BaseResponse<BasicUnitMaintainExportResponse> response = JSONObject.parseObject(datas, new TypeReference<BaseResponse<BasicUnitMaintainExportResponse>>() {
});
basicCorpImportService.importJsonData(response.getData());
spGetHttp.postBasicStatus(basicExportStatusEntity.getId());
}
}
}
}
public void dlBasicInv() {
BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(BasicProcessStatus.BASIC_INV + "");
List<BasicExportStatusEntity> pageSimpleResponse = baseResponse.getData();
if (pageSimpleResponse != null) {
List<BasicExportStatusEntity> basicExportStatusEntities = pageSimpleResponse;
if (basicExportStatusEntities != null && basicExportStatusEntities.size() > 0) {
for (BasicExportStatusEntity basicExportStatusEntity : basicExportStatusEntities) {
String datas = spGetHttp.getBasicData(basicExportStatusEntity.getId(), BasicProcessStatus.BASIC_INV);
BaseResponse<InvWarehouseExportResponse> response = JSONObject.parseObject(datas, new TypeReference<BaseResponse<InvWarehouseExportResponse>>() {
});
List<InvWarehouseEntity> invWarehouseEntities = response.getData().getInvWarehouseEntities();
if (invWarehouseEntities != null) {
invWarehouseService.importInvWarehouse(invWarehouseEntities);
spGetHttp.postBasicStatus(basicExportStatusEntity.getId());
}
}
}
}
}
//------------------------------------------------------------
public void dlAllData() {
@ -409,8 +353,8 @@ public class DlBasicService {
if (basicExportStatusEntity.getId().equals("AsyncUploadAllData")) {
heartService.uploadAllBus();
heartService.uploadAllData();
heartService.uploadAllOrder();
heartService.uploadScheduleList();
heartService.uploadAllOrder();
redisUtil.set("SPS_SYNC_UPLOAD_DATA", System.currentTimeMillis());
}
}

@ -262,10 +262,6 @@ public class IoTransInoutService {
}
}
public void transInout(String orderId) {
OrderEntity orderEntity = orderService.findById(orderId);
transInout(orderEntity);
}
public void transInout(OrderEntity orderEntity) {
@ -547,7 +543,6 @@ public class IoTransInoutService {
public void unCheckFinish(OrderEntity orderEntity, List<WarehouseEntity> warehouseEntityList) {
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
genOrderDetail(warehouseEntityList);
// checkMutiDi(orderEntity.getId(), bussinessTypeEntity); //校验一个DI是否绑定多个产品ID
orderEntity = orderService.findById(orderEntity.getId());
if (orderEntity.getContrastStatus() != ConstantStatus.ORDER_CHECK_FAIL) {
List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterAllByOrderIdFk(orderEntity.getId());
@ -560,11 +555,6 @@ public class IoTransInoutService {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
orderEntity.setUpdateTime(new Date());
orderService.updateOrder(orderEntity);
// orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_SUCCESS);
// if (orderEntity.getCustomerId() == null && orderEntity.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
//
// }
printOrder(orderEntity.getId());
}
}

@ -1,9 +1,9 @@
# 本地环境
server.port=9991
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.jdbc-url=jdbc:mysql://192.168.0.148:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root
spring.datasource.password=123456
spring.datasource.password=Glxp@6066
#spring.datasource.password=89083fb2fc145533
server.servlet.context-path=
#logging.level.com.glxp.api.admin.dao=debug
@ -20,21 +20,21 @@ logging.path=output/logs
# 不指定的情况下默认生成在项目根目录,按照配置生成所需的日志名称
#logging.file=D:/udi.log
file_path=D:/1s/udiwms/udiwmsfile/
#file_path=/home/glxp/udiwms
#file_path=D:/1s/udiwms/udiwmsfile/
file_path=/home/glxp/udiwms
#UDI数据下载
UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
SPMS_KEY=lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
#中转服务IP地址
SPSYNC_IP=http://127.0.0.1:9989
#SPSYNC_IP=http://139.159.187.130/SP_SYNC_SERVER
#SPSYNC_IP=http://127.0.0.1:9989
SPSYNC_IP=http://139.159.187.130/SP_SYNC_SERVER
#UDI_SERVER_URL=http://127.0.0.1:9995
##端口号
# Redis数据库索引默认为0
spring.redis.database=8
# Redis服务器地址
spring.redis.host=127.0.0.1
spring.redis.host=192.168.0.148
# Redis服务器连接端口
spring.redis.port=6379
# Redis服务器连接密码默认为空

@ -48,12 +48,13 @@
basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,basic_products.cpms,basic_products.originUuid
basic_products.scbssfbhsxrq,basic_products.cpms,basic_products.originUuid,basic_corp.name companyName
FROM company_product_relevance
inner JOIN basic_udirel
ON company_product_relevance.udiRlIdFk = basic_udirel.id
inner JOIN basic_products
ON basic_udirel.uuid = basic_products.uuid
left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId
<where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
@ -77,18 +78,18 @@
</if>
<if test="thrPiId != '' and thrPiId != null">
and (
thirdId LIKE concat('%',#{thrPiId},'%')
or thirdId1 LIKE concat('%',#{thrPiId},'%')
or thirdId2 LIKE concat('%',#{thrPiId},'%')
or thirdId3 LIKE concat('%',#{thrPiId},'%')
or thirdId4 LIKE concat('%',#{thrPiId},'%')
basic_udirel.thirdId LIKE concat('%',#{thrPiId},'%')
or basic_udirel.thirdId1 LIKE concat('%',#{thrPiId},'%')
or basic_udirel.thirdId2 LIKE concat('%',#{thrPiId},'%')
or basic_udirel.thirdId3 LIKE concat('%',#{thrPiId},'%')
or basic_udirel.thirdId4 LIKE concat('%',#{thrPiId},'%')
)
</if>
<if test="uuid != '' and uuid != null">
AND basic_udirel.uuid = #{uuid}
</if>
<if test="thirdId != '' and thirdId != null">
AND thirdId = #{thirdId}
AND basic_udirel.thirdId = #{thirdId}
</if>
<if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh},'%')
@ -97,28 +98,32 @@
AND diType =#{diType}
</if>
<if test="filterType != null and filterType == 1">
AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '' )
and basic_products.flbm <![CDATA[<>]]> ''
AND (basic_udirel.thirdId <![CDATA[<>]]> '' or basic_udirel.thirdId1 <![CDATA[<>]]> '' or basic_udirel.thirdId2 <![CDATA[<>]]> '' or
basic_udirel.thirdId3 <![CDATA[<>]]> '' or basic_udirel.thirdId4 <![CDATA[<>]]> '' )
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 2">
AND basic_products.flbm is NULL
AND basic_products.originUuid is NULL
</if>
<if test="filterType != null and filterType == 3">
AND thirdId is NULL and basic_products.flbm <![CDATA[<>]]> ''
AND basic_udirel.thirdId is NULL and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 4">
AND thirdId1 is NULL and basic_products.flbm <![CDATA[<>]]> ''
AND basic_udirel.thirdId1 is NULL and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 5">
AND thirdId2 is NULL and basic_products.flbm <![CDATA[<>]]> ''
AND basic_udirel.thirdId2 is NULL and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 6">
AND thirdId3 is NULL and basic_products.flbm <![CDATA[<>]]> ''
AND basic_udirel.thirdId3 is NULL and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 7">
AND thirdId4 is NULL and basic_products.flbm <![CDATA[<>]]> ''
AND basic_udirel.thirdId4 is NULL and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 10">
AND basic_udirel.updateTime is NULL
</if>
<if test="customerId != '' and customerId != null">
AND company_product_relevance.customerId = #{customerId}
</if>
@ -140,8 +145,11 @@
<if test="isDisable == false">
AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false )
</if>
<if test="companyName != '' and companyName != null">
AND basic_corp.name = #{companyName}
</if>
</where>
ORDER BY updateTime DESC
ORDER BY basic_udirel.updateTime DESC
</select>

@ -251,26 +251,30 @@
<if test="filterType != null and filterType == 1">
AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '' )
and basic_products.flbm <![CDATA[<>]]> ''
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 2">
AND basic_products.flbm is NULL
AND basic_products.originUuid is NULL
</if>
<if test="filterType != null and filterType == 3">
AND thirdId is NULL and basic_products.flbm <![CDATA[<>]]> ''
AND thirdId is NULL and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 4">
AND thirdId1 is NULL and basic_products.flbm <![CDATA[<>]]> ''
AND thirdId1 is NULL and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 5">
AND thirdId2 is NULL and basic_products.flbm <![CDATA[<>]]> ''
AND thirdId2 is NULL and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 6">
AND thirdId3 is NULL and basic_products.flbm <![CDATA[<>]]> ''
AND thirdId3 is NULL and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 7">
AND thirdId4 is NULL and basic_products.flbm <![CDATA[<>]]> ''
AND thirdId4 is NULL and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 10">
AND basic_udirel.updateTime is NULL
</if>
<if test="lockStatus != '' and lockStatus != null">
AND basic_udirel.lockStatus = #{lockStatus}
</if>

@ -5,7 +5,8 @@
<select id="filterStockOrderDetail" parameterType="com.glxp.api.admin.req.business.StockOrderDetailFilterRequest"
resultType="com.glxp.api.admin.entity.business.StockOrderDetailEntity">
select * from stock_order_detail
select stock_order_detail.*,basic_udirel.allowNoBatch from stock_order_detail
left join basic_udirel on stock_order_detail.relId = basic_udirel.id
<where>
<if test="orderIdFk != '' and orderIdFk!=null">
and orderIdFk = #{orderIdFk}
@ -23,6 +24,7 @@
and expireDate = #{expireDate}
</if>
</where>
group by stock_order_detail.id
ORDER BY id DESC
</select>
@ -33,7 +35,7 @@
basic_products.cpmctymc,basic_products.ggxh,
stock_order_detail.batchNo,stock_order_detail.expireDate,stock_order_detail.productDate,
stock_order_detail.count,stock_order_detail.reCount,stock_order_detail.sweepCount,stock_order_detail.relId,
basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,stock_order_detail.price,stock_order_detail.allowNoBatch
basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,stock_order_detail.price
from stock_order_detail
right JOIN basic_products
ON stock_order_detail.productId = basic_products.uuid
@ -63,7 +65,7 @@
replace
INTO stock_order_detail(id,
orderIdFk,productId,productName,spec,batchNo,productDate,
expireDate,count,reCount,sweepCount,ylqxzcrbarmc,zczbhhzbapzbh,price,relId,manufactory,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate,allowNoBatch)
expireDate,count,reCount,sweepCount,ylqxzcrbarmc,zczbhhzbapzbh,price,relId,manufactory,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate)
values(
#{id},
#{orderIdFk},
@ -84,7 +86,8 @@
#{firstSalesInvNo},
#{secSalesInvNo},
#{secSalesListNo},
#{invoiceDate},#{allowNoBatch}
#{invoiceDate}
)
</insert>
@ -92,7 +95,7 @@
parameterType="com.glxp.api.admin.entity.business.StockOrderDetailEntity">
replace INTO stock_order_detail(id,
orderIdFk,productId,productName,spec,batchNo,productDate,
expireDate,count,reCount,sweepCount,ylqxzcrbarmc,zczbhhzbapzbh,price,relId,manufactory,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate,allowNoBatch)
expireDate,count,reCount,sweepCount,ylqxzcrbarmc,zczbhhzbapzbh,price,relId,manufactory,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate)
values
<foreach collection="stockOrderDetailEntities" item="item" index="index"
separator=",">
@ -109,7 +112,7 @@
#{item.reCount},
#{item.sweepCount},
#{item.ylqxzcrbarmc},
#{item.zczbhhzbapzbh},#{item.price},#{item.relId},#{item.manufactory},#{item.firstSalesInvNo},#{item.secSalesInvNo},#{item.secSalesListNo},#{item.invoiceDate},#{item.allowNoBatch}
#{item.zczbhhzbapzbh},#{item.price},#{item.relId},#{item.manufactory},#{item.firstSalesInvNo},#{item.secSalesInvNo},#{item.secSalesListNo},#{item.invoiceDate}
)
</foreach>
@ -132,7 +135,6 @@
<if test="invoiceDate != null">invoiceDate=#{invoiceDate},</if>
<if test="relId != null">relId=#{relId},</if>
<if test="manufactory != null">manufactory=#{manufactory},</if>
<if test="allowNoBatch != null">allowNoBatch=#{allowNoBatch},</if>
</set>
WHERE id = #{id}

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.admin.dao.info.SyncDataSetDao">
<select id="selectSet"
resultType="com.glxp.api.admin.entity.info.SyncDataSetEntity">
SELECT *
FROM sync_data_set limit 1
</select>
<insert id="insert" parameterType="com.glxp.api.admin.entity.info.SyncDataSetEntity">
replace
INTO sync_data_set(id,typeBus, typeScan,
typeThird, basicProducts, basicCorp, basicInv, basicThirdProducts, basicThirdCorp, basicThirdInv
, basicThirdBusOrder, orderScanFinish, dbDiProducts,downstreamEnable,syncTime,)
values (
#{id},
#{typeBus},
#{typeScan},
#{typeThird},
#{basicProducts},
#{basicCorp},
#{basicInv},
#{basicThirdProducts},
#{basicThirdCorp},
#{basicThirdInv},
#{basicThirdBusOrder},
#{orderScanFinish},
#{dbDiProducts},#{downstreamEnable},#{syncTime},#{syncDonwloadTime}
)
</insert>
</mapper>

@ -233,7 +233,7 @@
</insert>
<select id="selectListByCode" resultMap="BaseResultMap">
select inv_warehouse_bussiness_type.code, inv_warehouse_bussiness_type.action, basic_bussiness_type.name
select inv_warehouse_bussiness_type.id, inv_warehouse_bussiness_type.code, inv_warehouse_bussiness_type.action, basic_bussiness_type.name
from inv_warehouse_bussiness_type
inner join basic_bussiness_type on inv_warehouse_bussiness_type.action = basic_bussiness_type.action
where code = #{code}

@ -114,6 +114,7 @@
#{cpms},
#{thirdSysFk},
#{updateTime},
#{supName},
#{model},
#{standard},
#{qtbm},

Loading…
Cancel
Save