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

Merge remote-tracking branch 'origin/busUser' into zhairh

Browse Source 
# Conflicts:
#	api-admin/src/main/resources/application-dev.properties
feature-order-fix
x_z 2 years ago
parent e7bbe483c7 3d7ae9f730
commit 08d7c5abd1
22 changed files with 249 additions and 28 deletions
Show Stats Download Patch File Download Diff File

4
api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java
Unescape Escape View File

@ -841,7 +841,9 @@ public class StockOrderController {
if (stockOrderDetailEntity.getRelId().equals(warehouseEntity.getRelId()) &&
StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo()).equals(StrUtil.trimToEmpty(warehouseEntity.getBatchNo()))
) {
stockOrderDetailEntity.setAcceptCount(stockOrderDetailEntity.getAcceptCount() + warehouseEntity.getCount());
stockOrderDetailEntity.setAcceptCount(stockOrderDetailEntity.getAcceptCount() +
udiInfoUtils.getActCount(warehouseEntity)
);
if (stockOrderDetailEntity.getAcceptCount() > stockOrderDetailEntity.getReCount()) {
return ResultVOUtils.error(500, "数量溢出！");
}

4
api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java
Unescape Escape View File

@ -288,12 +288,12 @@ public class OrderController {
}
Integer userId = customerService.getUserId();
String receiveEnable = systemParamConfigService.selectValueByParamKey("sps_sync_review_order");
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderFilterRequest.getAction());
StockOrderEntity stockOrderEntity = stockOrderService.findByBillNo(orderFilterRequest.getOrderId());
if (stockOrderEntity == null || stockOrderEntity.getOrderIdFk() == null) {
if (bussinessTypeEntity.isEntrutSpms()) {
if (bussinessTypeEntity.isEntrutSpms() || (StrUtil.nullToEmpty(receiveEnable).equals("1"))) {
BaseResponse baseResponse = spsDirectClient.downloadOrder(orderFilterRequest.getOrderId(), userId + "", orderFilterRequest.getAction());
if (baseResponse == null) {
return ResultVOUtils.error(500, "中继服务连接失败！");

3
api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertDao.java
Unescape Escape View File

@ -32,4 +32,7 @@ public interface SupCertDao {
@Param("oldManufacturerIdFk") String oldManufacturerIdFk, @Param("newManufacturerIdFk") String newManufacturerIdFk,
@Param("oldProductIdFk") String oldProductIdFk, @Param("newProductIdFk") String newProductIdFk);
boolean deleteCert(FilterSupCertRequest filterSupCertRequest);
}

5
api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncDataSetEntity.java
Unescape Escape View File

@ -32,7 +32,10 @@ public class SyncDataSetEntity {
private Integer orderSyncTime;
private Integer orderSyncDlTime;
private boolean unCheckCert;
private boolean checkedCert;
private boolean companyCert;
private boolean manufacturerCert;
private boolean productCert;
}

1
api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterPoductRequest.java
Unescape Escape View File

@ -17,4 +17,5 @@ public class FilterPoductRequest extends ListPageRequest {
private String manufacturerIdFk;
private String customerId;
private Integer auditStatus;
private String lastUpdateTime;
}

2
api-admin/src/main/java/com/glxp/api/admin/req/purchase/FilterSupManufacturerRequest.java
Unescape Escape View File

@ -13,4 +13,6 @@ public class FilterSupManufacturerRequest extends ListPageRequest {
private String customerId;
private Integer auditStatus;
private String manufacturerId;
private String lastUpdateTime;
}

6
api-admin/src/main/java/com/glxp/api/admin/res/info/SyncDataSetResponse.java
Unescape Escape View File

@ -37,8 +37,10 @@ public class SyncDataSetResponse {
private Integer orderSyncDlTime;
private Integer delaySyncTime;
private boolean unCheckCert;
private boolean checkedCert;
private boolean companyCert;
private boolean manufacturerCert;
private boolean productCert;
}

6
api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertService.java
Unescape Escape View File

@ -32,4 +32,10 @@ public interface SupCertService {
boolean insertCompanyCert(SupCertEntity supCertEntity);
boolean deleteById(String id);
boolean deleteByCustomerId(String customerId);
boolean delManufacturerId(String customerId, String manufacturerId);
boolean delProductId(String customerId, String manufacturerId, String productId);
}

41
api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertServiceImpl.java
Unescape Escape View File

@ -37,8 +37,11 @@ public class SupCertServiceImpl implements SupCertService {
if (filterSupCertRequest == null) {
return Collections.emptyList();
}
int offset = (filterSupCertRequest.getPage() - 1) * filterSupCertRequest.getLimit();
PageHelper.offsetPage(offset, filterSupCertRequest.getLimit());
if (filterSupCertRequest.getPage() != null) {
int offset = (filterSupCertRequest.getPage() - 1) * filterSupCertRequest.getLimit();
PageHelper.offsetPage(offset, filterSupCertRequest.getLimit());
}
List<SupCertEntity> companyEntities = supCertDao.getCompanyCert(filterSupCertRequest);
return companyEntities;
}
@ -114,4 +117,38 @@ public class SupCertServiceImpl implements SupCertService {
public boolean deleteById(String id) {
return supCertDao.deleteById(id);
}
@Override
public boolean deleteByCustomerId(String customerId) {
if (StrUtil.isNotEmpty(customerId)) {
FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
filterSupCertRequest.setCustomerId(customerId);
return supCertDao.deleteCert(filterSupCertRequest);
}
return false;
}
@Override
public boolean delManufacturerId(String customerId, String manufacturerId) {
if (StrUtil.isNotEmpty(customerId) && StrUtil.isNotEmpty(manufacturerId)) {
FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
filterSupCertRequest.setCustomerId(customerId);
filterSupCertRequest.setManufacturerIdFk(manufacturerId);
return supCertDao.deleteCert(filterSupCertRequest);
}
return false;
}
@Override
public boolean delProductId(String customerId, String manufacturerId, String productId) {
if (StrUtil.isNotEmpty(customerId) && StrUtil.isNotEmpty(manufacturerId) && StrUtil.isNotEmpty(productId)) {
FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
filterSupCertRequest.setCustomerId(customerId);
filterSupCertRequest.setManufacturerIdFk(manufacturerId);
filterSupCertRequest.setProductIdFk(productId);
return supCertDao.deleteCert(filterSupCertRequest);
}
return false;
}
}

7
api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCompanyServiceImpl.java
Unescape Escape View File

@ -43,8 +43,11 @@ public class SupCompanyServiceImpl implements SupCompanyService {
if (commitRequest == null) {
return Collections.emptyList();
}
int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit();
PageHelper.offsetPage(offset, commitRequest.getLimit());
if (commitRequest.getPage() != null) {
int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit();
PageHelper.offsetPage(offset, commitRequest.getLimit());
}
List<SupCompanyEntity> companyEntities = supCompanyDao.getSubCompany(commitRequest);
return companyEntities;
}

7
api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupManufacturerServiceImpl.java
Unescape Escape View File

@ -49,8 +49,11 @@ public class SupManufacturerServiceImpl implements SupManufacturerService {
if (filterSupManufacturerRequest == null) {
return Collections.emptyList();
}
int offset = (filterSupManufacturerRequest.getPage() - 1) * filterSupManufacturerRequest.getLimit();
PageHelper.offsetPage(offset, filterSupManufacturerRequest.getLimit());
if (filterSupManufacturerRequest.getPage() != null) {
int offset = (filterSupManufacturerRequest.getPage() - 1) * filterSupManufacturerRequest.getLimit();
PageHelper.offsetPage(offset, filterSupManufacturerRequest.getLimit());
}
List<SupManufacturerEntity> companyEntities = supManufacturerDao.getCompany(filterSupManufacturerRequest);
return companyEntities;
}

53
api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java
Unescape Escape View File

@ -27,6 +27,10 @@ import com.glxp.api.admin.entity.inout.WarehouseUserEntity;
import com.glxp.api.admin.entity.inventory.InvBusUserEntity;
import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity;
import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.api.admin.entity.purchase.SupCertEntity;
import com.glxp.api.admin.entity.purchase.SupCompanyEntity;
import com.glxp.api.admin.entity.purchase.SupManufacturerEntity;
import com.glxp.api.admin.entity.purchase.SupProductEntity;
import com.glxp.api.admin.entity.thrsys.*;
import com.glxp.api.admin.httpclient.SpGetHttpClient;
import com.glxp.api.admin.req.basic.BasicExportStatusRequest;
@ -41,6 +45,10 @@ import com.glxp.api.admin.service.inout.OrderService;
import com.glxp.api.admin.service.inventory.InvBusUserService;
import com.glxp.api.admin.service.inventory.InvSubWarehouseService;
import com.glxp.api.admin.service.inventory.InvWarehouseService;
import com.glxp.api.admin.service.purchase.SupCertService;
import com.glxp.api.admin.service.purchase.SupCompanyService;
import com.glxp.api.admin.service.purchase.SupManufacturerService;
import com.glxp.api.admin.service.purchase.SupProductService;
import com.glxp.api.admin.service.thrsys.ThrInvWarehouseService;
import com.glxp.api.admin.util.CustomUtil;
import com.glxp.api.admin.util.DateUtil;
@ -107,6 +115,16 @@ public class DlBasicService {
private InvBusUserService invBusUserService;
@Resource
SupCompanyService supCompanyService;
@Resource
SupManufacturerService supManufacturerService;
@Resource
SupProductService supProductService;
@Resource
SupCertService supCertService;
private static final Logger logger = LoggerFactory.getLogger(DlBasicService.class);
//------------------------------------------------------------
@ -353,6 +371,41 @@ public class DlBasicService {
remark.append("新增配送产品信息：").append(syncDataResponse.getNewUploadDiEntities().size()).append("条\n");
}
//配送企业首营资质
if (CollUtil.isNotEmpty(syncDataResponse.getSupCompanyEntities())) {
for (SupCompanyEntity supCompanyEntity : syncDataResponse.getSupCompanyEntities()) {
supCertService.deleteByCustomerId(supCompanyEntity.getCustomerId());
supCompanyEntity.setUpdateTime(null);
supCompanyService.insertCompany(supCompanyEntity);
}
}
//生产企业首营资质
if (CollUtil.isNotEmpty(syncDataResponse.getSupManufacturerEntities())) {
for (SupManufacturerEntity supManufacturerEntity : syncDataResponse.getSupManufacturerEntities()) {
supCertService.delManufacturerId(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId());
supManufacturerEntity.setUpdateTime(null);
supManufacturerService.insertCompany(supManufacturerEntity);
}
}
//配送企业首营资质
if (CollUtil.isNotEmpty(syncDataResponse.getSupProductEntities())) {
for (SupProductEntity supProductEntity : syncDataResponse.getSupProductEntities()) {
supCertService.delProductId(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId());
supProductEntity.setUpdateTime(null);
supProductService.insertRegistration(supProductEntity);
}
}
//所有证书提交
if (CollUtil.isNotEmpty(syncDataResponse.getSupCertEntities())) {
for (SupCertEntity supCertEntity : syncDataResponse.getSupCertEntities()) {
supCertService.insertCompanyCert(supCertEntity);
}
}
spGetHttp.postBasicStatus(basicExportStatusEntity.getId());
batchSession.close();

2
api-admin/src/main/java/com/glxp/api/admin/thread/DlUploadService.java
Unescape Escape View File

@ -49,7 +49,6 @@ public class DlUploadService {
dlBasicService.dlAllUDI();
// SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("dl_basic_udiinfo_status");
// long timeInterval = Long.parseLong(systemParamConfigEntity.getParamValue()) * 60 * 1000;
// long curTime = System.currentTimeMillis();
@ -65,5 +64,4 @@ public class DlUploadService {
}
}

14
api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java
Unescape Escape View File

@ -186,7 +186,11 @@ public class HeartService {
&& CollUtil.isEmpty(syncDataResponse.getDeptEntityList())
&& CollUtil.isEmpty(syncDataResponse.getWarehouseBussinessTypeEntities())
&& CollUtil.isEmpty(syncDataResponse.getWarehouseUserEntities())
&& CollUtil.isEmpty(syncDataResponse.getInvSubWarehouseEntities())) {
&& CollUtil.isEmpty(syncDataResponse.getInvSubWarehouseEntities())
&& CollUtil.isEmpty(syncDataResponse.getSupCompanyEntities())
&& CollUtil.isEmpty(syncDataResponse.getSupManufacturerEntities())
&& CollUtil.isEmpty(syncDataResponse.getSupProductEntities())
&& CollUtil.isEmpty(syncDataResponse.getSupCertEntities())) {
//数据不记录日志
return ResultVOUtils.success("无数据");
}
@ -254,6 +258,14 @@ public class HeartService {
logs = logs + "系统用户信息：" + syncDataResponse.getAuthAdminList().size() + "条\n";
if (CollUtil.isNotEmpty(syncDataResponse.getDeptEntityList()))
logs = logs + "部门信息：" + syncDataResponse.getDeptEntityList().size() + "条\n";
if (CollUtil.isNotEmpty(syncDataResponse.getSupCompanyEntities()))
logs = logs + "配送企业资质证书：" + syncDataResponse.getSupCompanyEntities().size() + "条\n";
if (CollUtil.isNotEmpty(syncDataResponse.getSupManufacturerEntities()))
logs = logs + "生产企业资质证书：" + syncDataResponse.getSupManufacturerEntities().size() + "条\n";
if (CollUtil.isNotEmpty(syncDataResponse.getSupProductEntities()))
logs = logs + "产品资质证书：" + syncDataResponse.getSupProductEntities().size() + "条\n";
if (CollUtil.isNotEmpty(syncDataResponse.getSupCertEntities()))
logs = logs + "相关资质证书总数：" + syncDataResponse.getSupCertEntities().size() + "条\n";
basicExportStatusEntity3.setRemark(logs);
basicExportStatusEntity3.setUpdateTime(new Date());
basicExportService.updateExportStatus(basicExportStatusEntity3);

2
api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java
Unescape Escape View File

@ -54,6 +54,8 @@ public class HeartTask implements SchedulingConfigurer {
private void process() {
logger.info("数据同步心跳");
//查询数据同步设置
SyncDataSetEntity syncDataSetEntity = syncDataSetDao.selectSet();
if (syncDataSetEntity.isDownstreamEnable()) {

8
api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java
Unescape Escape View File

@ -454,9 +454,10 @@ public class ThrProductsDlService {
).collect(Collectors.toList());
thrProductsImportDetailService.insertProductsDetailImports(thrProductsImportDetailEntities);
page++;
if (page * limit < erpProducts.getData().getTotal()) {
return page;
}
return page;
// if (page * limit < erpProducts.getData().getTotal()) {
// return page;
// }
} else {
return -1;
}
@ -466,7 +467,6 @@ public class ThrProductsDlService {
thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity);
return -1;
}
return -1;
}
public List<ThrProductsEntity> exportThrProducts(FilterThrProductsRequest filterThrProductsRequest) {

75
api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java
Unescape Escape View File

@ -14,6 +14,10 @@ import com.glxp.api.admin.entity.inout.*;
import com.glxp.api.admin.entity.inventory.InvBusUserEntity;
import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity;
import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.api.admin.entity.purchase.SupCertEntity;
import com.glxp.api.admin.entity.purchase.SupCompanyEntity;
import com.glxp.api.admin.entity.purchase.SupManufacturerEntity;
import com.glxp.api.admin.entity.purchase.SupProductEntity;
import com.glxp.api.admin.entity.thrsys.*;
import com.glxp.api.admin.req.auth.AuthAdminQueryRequest;
import com.glxp.api.admin.req.auth.FilterDeptRequest;
@ -22,6 +26,9 @@ import com.glxp.api.admin.req.inout.OrderFilterRequest;
import com.glxp.api.admin.req.inout.OrderQueryRequest;
import com.glxp.api.admin.req.inventory.FilterInvUserRequest;
import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest;
import com.glxp.api.admin.req.purchase.FilterPoductRequest;
import com.glxp.api.admin.req.purchase.FilterSupCompanyRequest;
import com.glxp.api.admin.req.purchase.FilterSupManufacturerRequest;
import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest;
import com.glxp.api.admin.req.thrsys.*;
import com.glxp.api.admin.res.basic.SpsSyncBusResponse;
@ -37,6 +44,10 @@ import com.glxp.api.admin.service.inout.*;
import com.glxp.api.admin.service.inventory.InvBusUserService;
import com.glxp.api.admin.service.inventory.InvSubWarehouseService;
import com.glxp.api.admin.service.inventory.InvWarehouseService;
import com.glxp.api.admin.service.purchase.SupCertService;
import com.glxp.api.admin.service.purchase.SupCompanyService;
import com.glxp.api.admin.service.purchase.SupManufacturerService;
import com.glxp.api.admin.service.purchase.SupProductService;
import com.glxp.api.admin.service.thrsys.*;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@ -87,6 +98,16 @@ public class UpBasicService {
@Resource
InvBusUserService invBusUserService;
@Resource
SupCompanyService supCompanyService;
@Resource
SupManufacturerService supManufacturerService;
@Resource
SupProductService supProductService;
@Resource
SupCertService supCertService;
public SpsSyncDataResponse upAllData(SpsSyncDataRequest spsSyncDataRequest) {
SpsSyncDataResponse syncDataResponse = new SpsSyncDataResponse();
SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet();
@ -255,6 +276,60 @@ public class UpBasicService {
syncDataResponse.setDeptEntityList(deptEntityList);
}
//资质证书
List<SupCertEntity> supCertEntityList = new ArrayList<>();
//获取供应商资质证书
FilterSupCompanyRequest filterSupCompanyRequest = new FilterSupCompanyRequest();
BeanUtils.copyProperties(spsSyncDataRequest, filterSupCompanyRequest);
filterSupCompanyRequest.setAuditStatus(ConstantStatus.AUDIT_PASS);
List<SupCompanyEntity> supCompanyEntities = supCompanyService.filterCompany(filterSupCompanyRequest);
syncDataResponse.setSupCompanyEntities(supCompanyEntities);
if (CollUtil.isNotEmpty(supCompanyEntities)) {
for (SupCompanyEntity supCompanyEntity : supCompanyEntities) {
List<SupCertEntity> tempsList = supCertService.findAll(supCompanyEntity.getCustomerId());
if (CollUtil.isNotEmpty(tempsList)) {
supCertEntityList.addAll(tempsList);
}
}
}
//获取生产企业资质证书
FilterSupManufacturerRequest filterSupManufacturerRequest = new FilterSupManufacturerRequest();
BeanUtils.copyProperties(spsSyncDataRequest, filterSupManufacturerRequest);
filterSupManufacturerRequest.setAuditStatus(ConstantStatus.AUDIT_PASS);
List<SupManufacturerEntity> supManufacturerEntities = supManufacturerService.getCompany(filterSupManufacturerRequest);
syncDataResponse.setSupManufacturerEntities(supManufacturerEntities);
if (CollUtil.isNotEmpty(supManufacturerEntities)) {
for (SupManufacturerEntity supManufacturerEntity : supManufacturerEntities) {
List<SupCertEntity> tempsList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId());
if (CollUtil.isNotEmpty(tempsList)) {
supCertEntityList.addAll(tempsList);
}
}
}
//获取产品资质证书
FilterPoductRequest filterPoductRequest = new FilterPoductRequest();
BeanUtils.copyProperties(spsSyncDataRequest, filterPoductRequest);
filterPoductRequest.setAuditStatus(ConstantStatus.AUDIT_PASS);
List<SupProductEntity> supProductEntities = supProductService.filterProducts(filterPoductRequest);
syncDataResponse.setSupProductEntities(supProductEntities);
if (CollUtil.isNotEmpty(supProductEntities)) {
for (SupProductEntity supProductEntity : supProductEntities) {
List<SupCertEntity> tempsList = supCertService.findAll(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId());
if (CollUtil.isNotEmpty(tempsList)) {
supCertEntityList.addAll(tempsList);
}
}
}
syncDataResponse.setSupCertEntities(supCertEntityList);
return syncDataResponse;
}

7
api-admin/src/main/resources/mybatis/mapper/info/SyncDataSetDao.xml
Unescape Escape View File

@ -11,13 +11,13 @@
</select>
<insert id="insert" parameterType="com.glxp.sale.admin.entity.param.SyncDataSetEntity">
<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,
orderUnReceive,orderUnCheck,busTypes,sysUser,orderSyncTime,orderSyncStart,basicSyncStart,entrustAction
,unCheckCert,checkedCert)
,unCheckCert,checkedCert,companyCert,manufacturerCert,productCert)
values (
#{id},
#{typeBus},
@ -43,8 +43,9 @@
#{basicSyncStart},
#{entrustAction},
#{unCheckCert},
#{checkedCert}
#{checkedCert}, #{companyCert}, #{manufacturerCert}, #{productCert}
)
</insert>
</mapper>

22
api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml
Unescape Escape View File

@ -112,7 +112,7 @@
<insert id="insertCompanyCert" parameterType="com.glxp.api.admin.entity.purchase.SupCertEntity">
INSERT INTO sup_cert( `name`, customerId, filePath, remark, createTime, updateTime
, vailDate, expireDate, `type`, manufacturerIdFk, productIdFk, code, auditStatus
, auditComment,status)
, auditComment, status)
values (#{name},
#{customerId},
#{filePath},
@ -121,7 +121,7 @@
#{updateTime},
#{vailDate},
#{expireDate},
#{type}, #{manufacturerIdFk}, #{productIdFk}, #{code}, #{auditStatus}, #{auditComment},#{status})
#{type}, #{manufacturerIdFk}, #{productIdFk}, #{code}, #{auditStatus}, #{auditComment}, #{status})
</insert>
<delete id="deleteById" parameterType="Map">
@ -130,4 +130,22 @@
WHERE id = #{id}
</delete>
<delete id="deleteCert" parameterType="com.glxp.api.admin.req.purchase.FilterSupCertRequest">
DELETE
FROM sup_cert
<where>
<if test="customerId != '' and customerId!=null">
and customerId = #{customerId}
</if>
<if test="manufacturerIdFk != '' and manufacturerIdFk!=null">
and manufacturerIdFk = #{manufacturerIdFk}
</if>
<if test="productIdFk != '' and productIdFk!=null">
and productIdFk = #{productIdFk}
</if>
</where>
</delete>
</mapper>

2
api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml
Unescape Escape View File

@ -153,7 +153,7 @@
</update>
<insert id="insertCompany" parameterType="com.glxp.api.admin.entity.purchase.SupCompanyEntity">
INSERT INTO company(companyName, bussinessStatus, creditNum, classes, area,
replace INTO sup_company(companyName, bussinessStatus, creditNum, classes, area,
detailAddr, appId, appSecret, contacts, mobile, tel, email, customerId, areaCode,
auditStatus, unitIdFk, createTime, createBy, updateTime, auditTime, auditComment,
editStatus)

2
api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml
Unescape Escape View File

@ -57,7 +57,7 @@
and (sup_manufacturer.auditStatus = 1 or sup_manufacturer.auditStatus=4 )
</if>
<if test="lastUpdateTime!=null and lastUpdateTime!=''">
<![CDATA[ and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]>
<![CDATA[ and DATE_FORMAT(sup_manufacturer.updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]>
</if>
</where>
</select>

4
api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml
Unescape Escape View File

@ -17,8 +17,8 @@
where recordProductName = #{recordProductName}
</select>
<select id="filterProducts" parameterType="com.glxp.sale.admin.req.purchase.FilterPoductRequest"
resultType="com.glxp.sale.admin.entity.purchase.SupProductEntity">
<select id="filterProducts" parameterType="com.glxp.api.admin.req.purchase.FilterPoductRequest"
resultType="com.glxp.api.admin.entity.purchase.SupProductEntity">
SELECT sup_product.* FROM sup_product
<where>
<if test="id != null and id != ''">

Write Preview
Loading…
Cancel
Save