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

首营资质同步问题,资质证书选择问题，

Browse Source
zhairh
anthonyywj2 3 years ago
parent 748055cf2d
commit 4c6dc5e448
14 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File

8
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java
Unescape Escape View File

@ -80,11 +80,11 @@ public class SpsSyncDownloadController {
if (CollUtil.isNotEmpty(baseResponse.getData().getSupCompanyEntities())) if (CollUtil.isNotEmpty(baseResponse.getData().getSupCompanyEntities()))
logs = logs + "配送企业资质证书：" + baseResponse.getData().getSupCompanyEntities().size() + "条\n"; logs = logs + "配送企业资质证书：" + baseResponse.getData().getSupCompanyEntities().size() + "条\n";
if (CollUtil.isNotEmpty(baseResponse.getData().getSupManufacturerEntities())) if (CollUtil.isNotEmpty(baseResponse.getData().getSupManufacturerEntities()))
logs = logs + "生产企业资质证书：" + baseResponse.getData().getThrProductsEntities().size() + "条\n"; logs = logs + "生产企业资质证书：" + baseResponse.getData().getSupManufacturerEntities().size() + "条\n";
if (CollUtil.isNotEmpty(baseResponse.getData().getSupCompanyEntities())) if (CollUtil.isNotEmpty(baseResponse.getData().getSupProductEntities()))
logs = logs + "产品资质证书：" + baseResponse.getData().getThrProductsEntities().size() + "条\n"; logs = logs + "产品资质证书：" + baseResponse.getData().getSupProductEntities().size() + "条\n";
if (CollUtil.isNotEmpty(baseResponse.getData().getSupCertEntities())) if (CollUtil.isNotEmpty(baseResponse.getData().getSupCertEntities()))
logs = logs + "资质证书：" + baseResponse.getData().getSupCertEntities().size() + "条\n"; logs = logs + "其他资质证书：" + baseResponse.getData().getSupCertEntities().size() + "条\n";
basicExportStatusEntity.setRemark(logs); basicExportStatusEntity.setRemark(logs);
basicExportService.updateExportStatus(basicExportStatusEntity); basicExportService.updateExportStatus(basicExportStatusEntity);

1
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java
Unescape Escape View File

@ -335,7 +335,6 @@ public class SpsSyncDownloadService {
List<SupProductEntity> supProductEntities = supProductService.filterProducts(filterPoductRequest); List<SupProductEntity> supProductEntities = supProductService.filterProducts(filterPoductRequest);
syncDataResponse.setSupProductEntities(supProductEntities); syncDataResponse.setSupProductEntities(supProductEntities);
if (CollUtil.isNotEmpty(supProductEntities)) { if (CollUtil.isNotEmpty(supProductEntities)) {
for (SupProductEntity supProductEntity : supProductEntities) { for (SupProductEntity supProductEntity : supProductEntities) {
List<SupCertEntity> tempsList = supCertService.findAll(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId()); List<SupCertEntity> tempsList = supCertService.findAll(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId());

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

@ -733,7 +733,9 @@ public class StockOrderController {
if (stockOrderDetailEntity.getRelId().equals(warehouseEntity.getRelId()) && if (stockOrderDetailEntity.getRelId().equals(warehouseEntity.getRelId()) &&
StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo()).equals(StrUtil.trimToEmpty(warehouseEntity.getBatchNo())) 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() > Integer.parseInt(stockOrderDetailEntity.getReCount())) { if (stockOrderDetailEntity.getAcceptCount() > Integer.parseInt(stockOrderDetailEntity.getReCount())) {
return ResultVOUtils.error(500, "数量溢出！"); return ResultVOUtils.error(500, "数量溢出！");
} }

6
api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertSetController.java
Unescape Escape View File

@ -37,7 +37,7 @@ public class SupCertSetController {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
filterCertSetsRequest.setNeed(0); // filterCertSetsRequest.setNeed(0);
List<SupCertSetEntity> supCertEntityList List<SupCertSetEntity> supCertEntityList
= supCertSetService.filterCertSets(filterCertSetsRequest); = supCertSetService.filterCertSets(filterCertSetsRequest);
PageInfo<SupCertSetEntity> pageInfo; PageInfo<SupCertSetEntity> pageInfo;
@ -57,8 +57,8 @@ public class SupCertSetController {
} }
supCertSetEntity.setUpdateTime(new Date()); supCertSetEntity.setUpdateTime(new Date());
if(supCertSetEntity.getType()==3){ if (supCertSetEntity.getType() == 3) {
if(supCertSetEntity.getFlbmList().size()>0){ if (supCertSetEntity.getFlbmList().size() > 0) {
String flbm = String.join(",", supCertSetEntity.getFlbmList()); String flbm = String.join(",", supCertSetEntity.getFlbmList());
supCertSetEntity.setFlbm(flbm); supCertSetEntity.setFlbm(flbm);
} }

10
api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupContactController.java
Unescape Escape View File

@ -12,6 +12,8 @@ import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils; import com.glxp.sale.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping; 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 org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -37,8 +39,8 @@ public class SupContactController {
} }
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("salewarehouse/customerContact/add") @PostMapping("salewarehouse/customerContact/add")
public BaseResponse addContact(CustomerContactEntity customerContactEntity) { public BaseResponse addContact(@RequestBody CustomerContactEntity customerContactEntity) {
boolean b = customerContactService.insertCustomerContact(customerContactEntity); boolean b = customerContactService.insertCustomerContact(customerContactEntity);
if (b) if (b)
@ -50,8 +52,8 @@ public class SupContactController {
} }
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("salewarehouse/customerContact/delete") @PostMapping("salewarehouse/customerContact/delete")
public BaseResponse deleteContact(DeleteRequest deleteRequest) { public BaseResponse deleteContact(@RequestBody DeleteRequest deleteRequest) {
boolean b = customerContactService.deleteById(Long.parseLong(deleteRequest.getId())); boolean b = customerContactService.deleteById(Long.parseLong(deleteRequest.getId()));
if (b) if (b)
return ResultVOUtils.success("删除成功"); return ResultVOUtils.success("删除成功");

3
api-admin/src/main/java/com/glxp/sale/admin/entity/param/SyncDataSetEntity.java
Unescape Escape View File

@ -35,5 +35,8 @@ public class SyncDataSetEntity {
private boolean unCheckCert; private boolean unCheckCert;
private boolean checkedCert; private boolean checkedCert;
private boolean companyCert;
private boolean manufacturerCert;
private boolean productCert;
} }

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

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

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

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

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

@ -37,8 +37,11 @@ public class SupCertServiceImpl implements SupCertService {
if (filterSupCertRequest == null) { if (filterSupCertRequest == null) {
return Collections.emptyList(); return Collections.emptyList();
} }
int offset = (filterSupCertRequest.getPage() - 1) * filterSupCertRequest.getLimit(); if (filterSupCertRequest.getPage() != null) {
PageHelper.offsetPage(offset, filterSupCertRequest.getLimit()); int offset = (filterSupCertRequest.getPage() - 1) * filterSupCertRequest.getLimit();
PageHelper.offsetPage(offset, filterSupCertRequest.getLimit());
}
List<SupCertEntity> companyEntities = supCertDao.getCompanyCert(filterSupCertRequest); List<SupCertEntity> companyEntities = supCertDao.getCompanyCert(filterSupCertRequest);
return companyEntities; return companyEntities;
} }

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

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

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

@ -49,8 +49,12 @@ public class SupManufacturerServiceImpl implements SupManufacturerService {
if (filterSupManufacturerRequest == null) { if (filterSupManufacturerRequest == null) {
return Collections.emptyList(); 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); List<SupManufacturerEntity> companyEntities = supManufacturerDao.getCompany(filterSupManufacturerRequest);
return companyEntities; return companyEntities;
} }

2
api-admin/src/main/resources/application-dev.properties
Unescape Escape View File

@ -1,7 +1,7 @@
# \u751F\u4EA7\u73AF\u5883 # \u751F\u4EA7\u73AF\u5883
server.port=9906 server.port=9906
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_za?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.jdbc-url=jdbc:mysql://192.168.0.55:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=123456 spring.datasource.password=123456
spring.datasource.hikari.connection-timeout=60000 spring.datasource.hikari.connection-timeout=60000

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

@ -17,7 +17,7 @@
typeThird, basicProducts, basicCorp, basicInv, basicThirdProducts, basicThirdCorp, basicThirdInv typeThird, basicProducts, basicCorp, basicInv, basicThirdProducts, basicThirdCorp, basicThirdInv
, basicThirdBusOrder, orderScanFinish, dbDiProducts,downstreamEnable,syncTime, , basicThirdBusOrder, orderScanFinish, dbDiProducts,downstreamEnable,syncTime,
orderUnReceive,orderUnCheck,busTypes,sysUser,orderSyncTime,orderSyncStart,basicSyncStart,entrustAction orderUnReceive,orderUnCheck,busTypes,sysUser,orderSyncTime,orderSyncStart,basicSyncStart,entrustAction
,unCheckCert,checkedCert) ,unCheckCert,checkedCert,companyCert,manufacturerCert,productCert)
values ( values (
#{id}, #{id},
#{typeBus}, #{typeBus},
@ -43,7 +43,7 @@
#{basicSyncStart}, #{basicSyncStart},
#{entrustAction}, #{entrustAction},
#{unCheckCert}, #{unCheckCert},
#{checkedCert} #{checkedCert}, #{companyCert}, #{manufacturerCert}, #{productCert}
) )
</insert> </insert>

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 ) and (sup_manufacturer.auditStatus = 1 or sup_manufacturer.auditStatus=4 )
</if> </if>
<if test="lastUpdateTime!=null and lastUpdateTime!=''"> <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> </if>
</where> </where>

Write Preview
Loading…
Cancel
Save