中继服务同步

master
anthonyywj2 3 years ago
parent 42cada6820
commit 497b584bbf

@ -19,5 +19,12 @@ public class BasicProcessStatus {
public static final int EXPORT_SMP = 2;
public static final int EXPORT_JSON = 3;
public static final int BASIC_UDI = 1; //耗材字典
public static final int BASIC_INV = 2; //仓库字典
public static final int BASIC_CORP = 3; //往来单位
public static final int BASIC_THIRD_PRODUCTS = 4; //往来单位
public static final int BASIC_THIRD_CORP = 5; //往来单位
public static final int BASIC_THIRD_ORDER = 6; //往来单位
}

@ -7,6 +7,8 @@ import com.glxp.api.admin.entity.basic.CorpExportLogEntity;
import com.glxp.api.admin.req.basic.*;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.BasicUnitMaintainExportResponse;
import com.glxp.api.admin.res.basic.UdiRelevanceExportJsonResponse;
import com.glxp.api.admin.service.basic.BasicUnitMaintainService;
import com.glxp.api.admin.service.basic.CorpExportLogService;
import com.glxp.api.admin.thread.BasicGenExcelService;
@ -37,7 +39,8 @@ public class CorpExportLogController {
@Resource
private BasicUnitMaintainService basicUnitMaintainService;
@Resource
private BasicGenJsonService basicGenJsonService;;
private BasicGenJsonService basicGenJsonService;
;
@GetMapping("/udiwms/corps/exportLog/filter")
public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques,
@ -132,10 +135,11 @@ public class CorpExportLogController {
corpExportLogEntity.setDlCount(0);
corpExportLogEntity.setType(BasicProcessStatus.EXPORT_SMP);
corpExportLogService.insertCorpExportLog(corpExportLogEntity);
basicGenExcelService.uploadCorpSmp(genKey, corpsExportRequest);
BasicUnitMaintainExportResponse basicUnitMaintainExportResponse = basicGenJsonService.exportCorpJson(corpsExportRequest);
basicGenExcelService.uploadCorpSmpJson(genKey, basicUnitMaintainExportResponse);
return ResultVOUtils.success("后台正在上传,请稍后刷新查看!");
}
//往来单位接口下载(第三方使用)
@GetMapping("/udiwms/basic/corps/download")
public BaseResponse filterBasicUnitMaintain(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
@ -151,7 +155,6 @@ public class CorpExportLogController {
pageSimpleResponse.setList(basicUnitMaintainEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
}

@ -127,7 +127,7 @@ public class StockOrderController {
List<StockOrderDetailEntity> stockOrderDetailEntityList = stockOrderPostRequest.getSubErpOrders();
for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) {
stockOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId());
stockOrderDetailEntity.setSweepCount(0 + "");
stockOrderDetailEntity.setSweepCount(0);
}
stockOrderDetailTempService.insertStockOrderDetailTemps(stockOrderDetailEntityList);
}
@ -212,11 +212,11 @@ public class StockOrderController {
if (StringUtils.isBlank(stockOrderDetailEntity.getId())) {
stockOrderDetailEntity.setReCount(
StringUtils.isBlank(stockOrderDetailEntity.getReCount()) ? "0" : stockOrderDetailEntity.getReCount());
stockOrderDetailEntity.getReCount());
stockOrderDetailEntity.setCount(
StringUtils.isBlank(stockOrderDetailEntity.getCount()) ? "0" : stockOrderDetailEntity.getCount());
stockOrderDetailEntity.getCount());
stockOrderDetailEntity.setSweepCount(
StringUtils.isBlank(stockOrderDetailEntity.getSweepCount()) ? "0" : stockOrderDetailEntity.getSweepCount());
stockOrderDetailEntity.getSweepCount());
stockOrderDetailService.insertStockOrderDetail(stockOrderDetailEntity);
} else {
@ -417,7 +417,7 @@ public class StockOrderController {
stockPrintEntity.setBatchNo(stockOrderDetailEntity.getBatchNo());
stockPrintEntity.setSDetailId(stockOrderDetailEntity.getId());
stockPrintEntity.setUdiRlIdFk(udiRelevanceResponse.getId() + "");
stockPrintEntity.setCount(Integer.parseInt(stockOrderDetailEntity.getReCount()));
stockPrintEntity.setCount(stockOrderDetailEntity.getReCount());
stockPrintEntities.add(stockPrintEntity);
}
} else {
@ -431,7 +431,7 @@ public class StockOrderController {
stockPrintEntity.setExpireDate(stockOrderDetailEntity.getExpireDate());
stockPrintEntity.setBatchNo(stockOrderDetailEntity.getBatchNo());
stockPrintEntity.setSDetailId(stockOrderDetailEntity.getId());
stockPrintEntity.setCount(Integer.parseInt(stockOrderDetailEntity.getReCount()));
stockPrintEntity.setCount(stockOrderDetailEntity.getReCount());
stockPrintEntities.add(stockPrintEntity);
}
}

@ -201,13 +201,13 @@ public class StockOrderDetailController {
if (systemParamConfigEntitySODCountMax == null ||
StringUtils.isNotBlank(systemParamConfigEntitySODCountMax.getParamValue()) &&
systemParamConfigEntitySODCountMax.getParamValue().equals("1")) {
if (Integer.parseInt(tempStockOrderDetailEntity.getCount()) <
Integer.parseInt(tempStockOrderDetailEntity.getReCount())) {
if (tempStockOrderDetailEntity.getCount() <
tempStockOrderDetailEntity.getReCount()) {
return ResultVOUtils.error(500, "配货数量超过订单数量");
}
}
stockOrderDetailEntity.setReCount(
String.valueOf(Integer.parseInt(tempStockOrderDetailEntity.getReCount()) + 1));
tempStockOrderDetailEntity.getReCount() + 1);
stockOrderDetailService.updateById(stockOrderDetailEntity);
return ResultVOUtils.success(orderId);
@ -232,7 +232,7 @@ public class StockOrderDetailController {
stockOrderDetailEntity.setBatchNo(udiEntity.getBatchNo());
stockOrderDetailEntity.setProductDate(udiEntity.getProduceDate());
stockOrderDetailEntity.setExpireDate(udiEntity.getExpireDate());
stockOrderDetailEntity.setCount(count);
stockOrderDetailEntity.setCount(Integer.parseInt(count));
return ResultVOUtils.success(stockOrderDetailEntity);
}
@ -272,8 +272,8 @@ public class StockOrderDetailController {
stockOrderDetailEntity.setProductId(udiInfoEntity.getRlId() + "");
stockOrderDetailEntity.setProductName(udiInfoEntity.getCpmctymc());
stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh());
stockOrderDetailEntity.setCount(0 + "");
stockOrderDetailEntity.setReCount(0 + "");
stockOrderDetailEntity.setCount(0);
stockOrderDetailEntity.setReCount(0);
stockOrderDetailEntity.setBatchNo(stockSelectDataEntity.getBatchNo());
stockOrderDetailEntity.setProductDate(stockSelectDataEntity.getProductDate());
stockOrderDetailEntity.setExpireDate(stockSelectDataEntity.getExpireDate());
@ -282,7 +282,7 @@ public class StockOrderDetailController {
if (stockOrderIdsRequest.getUdiEntity() != null) {
UdiEntity udiEntity = stockOrderIdsRequest.getUdiEntity();
stockOrderDetailEntity.setBatchNo(udiEntity.getBatchNo());
stockOrderDetailEntity.setCount(1 + "");
stockOrderDetailEntity.setCount(1);
stockOrderDetailEntity.setProductDate(udiEntity.getProduceDate());
stockOrderDetailEntity.setExpireDate(udiEntity.getExpireDate());
if (originDatas != null && originDatas.size() > 0) {
@ -310,7 +310,7 @@ public class StockOrderDetailController {
for (StockOrderDetailEntity temp : originDatas) {
if ((temp.getBatchNo() != null && temp.getBatchNo().equals(stockOrderDetailEntity.getBatchNo()))
&& (temp.getProductId().equals(stockOrderDetailEntity.getProductId()))) {
temp.setCount(Integer.parseInt(temp.getCount()) + Integer.parseInt(stockOrderDetailEntity.getCount()) + "");
temp.setCount(temp.getCount() + stockOrderDetailEntity.getCount());
return true;
}
}
@ -346,9 +346,9 @@ public class StockOrderDetailController {
stockOrderDetailEntity.setBatchNo(udiEntity.getBatchNo());
stockOrderDetailEntity.setProductDate(udiEntity.getProduceDate());
stockOrderDetailEntity.setExpireDate(udiEntity.getExpireDate());
stockOrderDetailEntity.setCount(count);
stockOrderDetailEntity.setReCount(count);
stockOrderDetailEntity.setSweepCount(0 + "");
stockOrderDetailEntity.setCount(Integer.parseInt(count));
stockOrderDetailEntity.setReCount(Integer.parseInt(count));
stockOrderDetailEntity.setSweepCount(0);
stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc());
stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());

@ -99,8 +99,8 @@ public class StockQRCodeTextController {
for (StockQRCodeTextEntity stockQRCodeTextEntity : stockQRCodeTextEntityList) {
StockOrderDetailEntity stockOrderDetailEntity = stockOrderDetailService.findOne(stockQRCodeTextEntity.getDetailId());
if (stockOrderDetailEntity != null) {
stockQRCodeTextEntity.setCount(stockOrderDetailEntity.getCount());
stockQRCodeTextEntity.setReCount(stockOrderDetailEntity.getReCount());
stockQRCodeTextEntity.setCount(stockOrderDetailEntity.getCount()+"");
stockQRCodeTextEntity.setReCount(stockOrderDetailEntity.getReCount()+"");
} else {
stockQRCodeTextEntity.setCount("0");
stockQRCodeTextEntity.setReCount("0");
@ -335,7 +335,7 @@ public class StockQRCodeTextController {
@RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception {
StockOrderEntity stockOrderEntity =
stockOrderService.findById(inspectionPDFTemplateRequest.getOrderId());
stockOrderService.findById(inspectionPDFTemplateRequest.getQueryId());
if (stockOrderEntity == null) {
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该订单");
}

@ -289,10 +289,10 @@ public class OrderDetailController {
}
BeanUtils.copyProperties(thrOrderDetailEntity, stockOrderDetailEntity);
stockOrderDetailEntity.setProductId(udiRelevanceEntity.getId());
stockOrderDetailEntity.setCount(thrOrderDetailEntity.getCount() + "");
stockOrderDetailEntity.setReCount(thrOrderDetailEntity.getReCount() + "");
stockOrderDetailEntity.setCount(thrOrderDetailEntity.getCount());
stockOrderDetailEntity.setReCount(thrOrderDetailEntity.getReCount());
stockOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId());
stockOrderDetailEntity.setSweepCount(0 + "");
stockOrderDetailEntity.setSweepCount(0);
stockOrderDetailEntityList.add(stockOrderDetailEntity);
}
stockOrderDetailService.insertStockOrderDetails(stockOrderDetailEntityList);

@ -60,12 +60,6 @@ public class WareHouseController {
@Resource
private IoTransInoutService ioTransInoutService;
@Resource
CompanyService companyService;
@Resource
AuthAdminService authAdminService;
@Resource
BasicUnitMaintainService basicUnitMaintainService;
@Resource
private WarehouseUserService warehouseUserService;
@Resource
private WarehouseBussinessTypeService warehouseBussinessTypeService;
@ -350,6 +344,7 @@ public class WareHouseController {
orderSaveRequest.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
orderSaveRequest.setExportStatus(ConstantStatus.ORDER_EXPORT_UN);
orderSaveRequest.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);
orderSaveRequest.setReceiveStatus(0);
orderSaveRequest.setSignStatus(ConstantStatus.ORDER_SIGN_UN);
orderService.insertOrder(orderSaveRequest);
}

@ -132,7 +132,7 @@ public class ContrastErpUtil {
//根据条码获取产品详情,数量等
UdiInfoEntity udiInfoEntity = inoutUtils.getUdiInfoByRlId(udiInfoService, udiRelevanceService, warehouseEntity.getCode());
udiInfoEntity.setCount(customService.getActCount(warehouseEntity));
udiInfoEntity.setCount(customService.getActCount(warehouseEntity) * warehouseEntity.getCount());
if (warehouseEntity.getRelId() == null) {
errMsg = warehouseEntity.getCode() + "产品信息未维护";

@ -2,6 +2,7 @@ package com.glxp.api.admin.controller.thrsys;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.constant.BasicProcessStatus;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.thrsys.*;
import com.glxp.api.admin.entity.thrsys.ThrCorpExportLogEntity;
@ -137,7 +138,7 @@ public class ThrCorpExportLogController {
thrCorpExportLogEntity.setFilePath(fileName);
thrCorpExportLogEntity.setUpdateTime(new Date());
thrCorpExportLogEntity.setDlCount(0);
thrCorpExportLogEntity.setType(1);
thrCorpExportLogEntity.setType(BasicProcessStatus.EXPORT_EXCEL);
thrCorpExportLogService.insertThrCorpExportLog(thrCorpExportLogEntity);
//thrCorpsDlService.genExcel(genKey, thrCorpExportRequest);
//修改为导出json文件
@ -147,6 +148,35 @@ public class ThrCorpExportLogController {
}
//往来单位导出生成Excel并创建生成记录
@PostMapping("/udiwms/thrCorp/importLog/upload")
public BaseResponse uploadSmp(@RequestBody ThrCorpExportRequest thrCorpExportRequest) {
//String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".xls";
String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".udi";
File file = new File(fileName);
if (!file.exists()) {
try {
file.createNewFile();
} catch (IOException e) {
e.printStackTrace();
}
}
ThrCorpExportLogEntity thrCorpExportLogEntity = new ThrCorpExportLogEntity();
thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS);
String genKey = CustomUtil.getId();
thrCorpExportLogEntity.setGenKey(genKey);
thrCorpExportLogEntity.setFilePath(fileName);
thrCorpExportLogEntity.setUpdateTime(new Date());
thrCorpExportLogEntity.setDlCount(0);
thrCorpExportLogEntity.setType(BasicProcessStatus.EXPORT_SMP);
thrCorpExportLogService.insertThrCorpExportLog(thrCorpExportLogEntity);
thrCorpsDlService.uploadSmp(genKey, thrCorpExportRequest);
return ResultVOUtils.success("后台正在导出生成udi文件请稍后刷新查看!");
}
//第三方往来单位接口下载(第三方使用)
@GetMapping("/udiwms/thrsys/thrCorp/download")
public BaseResponse downloadThrCorps(BasicUnitMaintainFilterRequest unitMaintainFilterRequest,

@ -122,8 +122,7 @@ public class ThrOrderExportLogController {
@PostMapping("/udiwms/thrOrder/importLog/export")
public BaseResponse excelDownload(@RequestBody ThrOrderExportRequest thrOrderExportRequest) {
String fileName = "D:\\udiwms\\exportFile\\" + "业务单据导出" + System.currentTimeMillis() + ".xls";
String fileName = "D:\\udiwms\\exportFile\\" + "业务单据导出" + System.currentTimeMillis() + ".udi";
File file = new File(fileName);
if (!file.exists()) {
try {
@ -141,8 +140,8 @@ public class ThrOrderExportLogController {
udiInfoExportLogEntity.setType(BasicProcessStatus.EXPORT_EXCEL);
udiInfoExportLogEntity.setDlCount(0);
thrOrderExportLogService.insertThrOrderExportLog(udiInfoExportLogEntity);
thrOrdersDlService.genExcel(genKey, thrOrderExportRequest);
return ResultVOUtils.success("后台正在导出生成excel文件,请稍后刷新查看!");
thrOrdersDlService.genJsonFile(genKey, thrOrderExportRequest);
return ResultVOUtils.success("后台正在导出生成udi文件,请稍后刷新查看!");
}
@ -159,7 +158,7 @@ public class ThrOrderExportLogController {
udiInfoExportLogEntity.setType(BasicProcessStatus.EXPORT_SMP);
udiInfoExportLogEntity.setDlCount(0);
thrOrderExportLogService.insertThrOrderExportLog(udiInfoExportLogEntity);
thrOrdersDlService.uploadSmp(genKey, thrOrderExportRequest);
thrOrdersDlService.uploadSpssync(genKey, thrOrderExportRequest);
return ResultVOUtils.success("后台正在上传,请稍后刷新查看!");
}
@ -174,14 +173,14 @@ public class ThrOrderExportLogController {
}
BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(filterErpOrderRequest.getBillAction(), "orderQueryUrl");
if (!basicThirdSysDetailEntity.getEnabled()|| basicThirdSysDetailEntity.getThirdSysFk() == null) {
if (!basicThirdSysDetailEntity.getEnabled() || basicThirdSysDetailEntity.getThirdSysFk() == null) {
return ResultVOUtils.error(500, "第三方业务单据服务未启用");
}
if (basicThirdSysDetailEntity.getValue() == null) {
return ResultVOUtils.error(500, "业务单据查询接口未定义");
}
if (basicThirdSysDetailEntity.getFromType()!=null && basicThirdSysDetailEntity.getFromType() == 0 ) {
if (basicThirdSysDetailEntity.getFromType() != null && basicThirdSysDetailEntity.getFromType() == 0) {
return new ErpOrderClient(basicThirdSysDetailEntity.getValue()).getErpOrderResponse(filterErpOrderRequest);
} else {
//todo 订单查询,需加日期

@ -154,7 +154,7 @@ public class ThrProductsExportLogController {
thrProductsExportLogEntity.setDlCount(0);
thrProductsExportLogEntity.setType(BasicProcessStatus.EXPORT_SMP);
thrProductsExportLogService.insertThrProductsExportLog(thrProductsExportLogEntity);
thrProductsDlService.uploadSmp(genKey, thrProductsExportRequest);
thrProductsDlService.uploadSpssync(genKey, thrProductsExportRequest);
return ResultVOUtils.success("后台正在上传,请稍后刷新查看!");
}

@ -0,0 +1,25 @@
package com.glxp.api.admin.dao.basic;
import com.glxp.api.admin.entity.basic.BasicExportStatusEntity;
import com.glxp.api.admin.entity.inout.IOOrderStatusEntity;
import com.glxp.api.admin.req.basic.BasicExportStatusRequest;
import com.glxp.api.admin.req.inout.OrderStatusFilterRequest;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface BasicExportDao {
List<BasicExportStatusEntity> filterExportStatus(BasicExportStatusRequest basicExportStatusRequest);
boolean insertExportStatus(BasicExportStatusEntity ioOrderStatusEntity);
boolean deleteById(@Param("id") Integer id);
boolean updateExportStatus(BasicExportStatusEntity warehouseEntity);
}

@ -0,0 +1,22 @@
package com.glxp.api.admin.dao.thrsys;
import com.glxp.api.admin.entity.thrsys.ThrImportLogEntity;
import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface ThrImportLogDao {
List<ThrImportLogEntity> filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest);
boolean insertImportLog(ThrImportLogEntity thrOrderImportLogEntity);
boolean updateImportLog(ThrImportLogEntity thrOrderImportLogEntity);
boolean deleteById(@Param("id") String id);
}

@ -0,0 +1,18 @@
package com.glxp.api.admin.entity.basic;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
public class BasicExportStatusEntity {
private Integer id;
private String idDatas;
private Integer status;
private Integer type;
private Date updateTime;
}

@ -15,9 +15,9 @@ public class StockOrderDetailEntity {
private String batchNo;
private String expireDate;
private String productDate;
private String count;
private String reCount;
private String sweepCount;
private Integer count;
private Integer reCount;
private Integer sweepCount;
private String ylqxzcrbarmc;
private String zczbhhzbapzbh;

@ -0,0 +1,20 @@
package com.glxp.api.admin.entity.thrsys;
import lombok.Data;
import java.util.Date;
@Data
public class ThrImportLogEntity {
private Integer id;
private String genKey;
private Integer status;
private Integer importType;
private Date updateTime;
private String fromType;
private String thirdSysFk;
private String remark;
}

@ -0,0 +1,11 @@
package com.glxp.api.admin.req.basic;
import com.glxp.api.admin.req.ListPageRequest;
import lombok.Data;
@Data
public class BasicExportStatusRequest extends ListPageRequest {
private Integer id;
private Integer status;
private Integer type;
}

@ -0,0 +1,13 @@
package com.glxp.api.admin.req.sync;
import lombok.Data;
import java.util.List;
@Data
public class BasicDataFilterRequest {
List<String> relIds;
List<String> ids;
}

@ -1,5 +1,6 @@
package com.glxp.api.admin.req.thrsys;
import com.glxp.api.admin.entity.thrsys.ThrCorpEntity;
import com.glxp.api.admin.res.basic.ErpUnitsResponse;
import lombok.Data;
@ -11,4 +12,5 @@ public class PostThrCorpRequest {
private String thirdSys;
private String uploadType;
private List<ErpUnitsResponse> corps;
private List<ThrCorpEntity> datas;
}

@ -11,6 +11,7 @@ public class ErpOrderResponse {
private String billType;
private String billFlag;
private String originType;
private String thirdSysFk;
private List<ErpOrderResponse.SubErpOrder> subErpOrders;
public String getBillNo() {
@ -86,7 +87,16 @@ public class ErpOrderResponse {
this.id = id;
}
public String getThirdSysFk() {
return thirdSysFk;
}
public void setThirdSysFk(String thirdSysFk) {
this.thirdSysFk = thirdSysFk;
}
public static class SubErpOrder {
private Integer id;
private String productId;
private String productName;
private String spec;
@ -95,9 +105,35 @@ public class ErpOrderResponse {
private String productDate;
private Integer count; //账面数量
private Integer reCount; //实际数量
private String orderIdFk;
private String thirdSysFk;
private String sweepCount;
private String relId; //基础信息关联表主键
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getOrderIdFk() {
return orderIdFk;
}
public void setOrderIdFk(String orderIdFk) {
this.orderIdFk = orderIdFk;
}
public String getThirdSysFk() {
return thirdSysFk;
}
public void setThirdSysFk(String thirdSysFk) {
this.thirdSysFk = thirdSysFk;
}
public String getProductId() {
return productId;
}

@ -0,0 +1,16 @@
package com.glxp.api.admin.res.thrsys;
import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity;
import com.glxp.api.admin.entity.thrsys.ThrOrderEntity;
import lombok.Data;
import java.util.List;
@Data
public class ThrOrderExportJsonResponse {
private List<ThrOrderEntity> thrOrderEntityList;
private List<ThrOrderDetailEntity> thrOrderDetailEntities;
}

@ -0,0 +1,20 @@
package com.glxp.api.admin.service.basic;
import com.glxp.api.admin.entity.basic.BasicExportStatusEntity;
import com.glxp.api.admin.req.basic.BasicExportStatusRequest;
import com.glxp.api.admin.req.inout.OrderStatusFilterRequest;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface BasicExportService {
List<BasicExportStatusEntity> filterExportStatus(BasicExportStatusRequest basicExportStatusRequest);
boolean insertExportStatus(BasicExportStatusEntity ioOrderStatusEntity);
boolean deleteById(Integer id);
boolean updateExportStatus(BasicExportStatusEntity warehouseEntity);
}

@ -0,0 +1,48 @@
package com.glxp.api.admin.service.basic.impl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.dao.basic.BasicExportDao;
import com.glxp.api.admin.entity.basic.BasicExportStatusEntity;
import com.glxp.api.admin.entity.inout.IOOrderStatusEntity;
import com.glxp.api.admin.req.basic.BasicExportStatusRequest;
import com.glxp.api.admin.req.inout.OrderStatusFilterRequest;
import com.glxp.api.admin.service.basic.BasicExportService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
@Service
public class BasicExportServiceImpl implements BasicExportService {
@Resource
BasicExportDao basicExportDao;
@Override
public List<BasicExportStatusEntity> filterExportStatus(BasicExportStatusRequest basicExportStatusRequest) {
if (basicExportStatusRequest == null) {
return Collections.emptyList();
}
if (basicExportStatusRequest.getPage() != null) {
int offset = (basicExportStatusRequest.getPage() - 1) * basicExportStatusRequest.getLimit();
PageHelper.offsetPage(offset, basicExportStatusRequest.getLimit());
}
return basicExportDao.filterExportStatus(basicExportStatusRequest);
}
@Override
public boolean insertExportStatus(BasicExportStatusEntity basicExportStatusEntity) {
return basicExportDao.insertExportStatus(basicExportStatusEntity);
}
@Override
public boolean deleteById(Integer id) {
return basicExportDao.deleteById(id);
}
@Override
public boolean updateExportStatus(BasicExportStatusEntity basicExportStatusEntity) {
return basicExportDao.updateExportStatus(basicExportStatusEntity);
}
}

@ -108,8 +108,8 @@ public class ThrDataService {
erpOrderResponse.setBatchNo(thrOrderDetailEntity.getBatchNo());
erpOrderResponse.setProductDate(thrOrderDetailEntity.getProductDate());
erpOrderResponse.setExpireDate(thrOrderDetailEntity.getExpireDate());
erpOrderResponse.setReCount(Integer.parseInt(thrOrderDetailEntity.getReCount()));
erpOrderResponse.setErpCount(Integer.parseInt(thrOrderDetailEntity.getCount()));
erpOrderResponse.setReCount(thrOrderDetailEntity.getReCount());
erpOrderResponse.setErpCount(thrOrderDetailEntity.getCount());
erpOrderResponse.setAuthCode(thrOrderDetailEntity.getZczbhhzbapzbh());
erpOrderResponse.setProductCompany(thrOrderDetailEntity.getYlqxzcrbarmc());
erpOrderResponse.setPackSpec(thrOrderDetailEntity.getSpec());

@ -0,0 +1,20 @@
package com.glxp.api.admin.service.thrsys;
import com.glxp.api.admin.entity.thrsys.ThrImportLogEntity;
import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest;
import java.util.List;
public interface ThrImportLogService {
List<ThrImportLogEntity> filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest);
boolean insertImportLog(ThrImportLogEntity thrProductsImportLogEntity);
boolean updateImportLog(ThrImportLogEntity thrProductsImportLogEntity);
boolean deleteById(String id);
ThrImportLogEntity selectByGenKey(String genKey);
}

@ -0,0 +1,58 @@
package com.glxp.api.admin.service.thrsys.impl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.dao.thrsys.ThrImportLogDao;
import com.glxp.api.admin.entity.thrsys.ThrImportLogEntity;
import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest;
import com.glxp.api.admin.service.thrsys.ThrImportLogService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
@Service
public class ThrImportLogServiceImpl implements ThrImportLogService {
@Resource
ThrImportLogDao thrImportLogDao;
@Override
public List<ThrImportLogEntity> filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest) {
if (filterInCodeLogRequest == null) {
return Collections.emptyList();
}
if (filterInCodeLogRequest.getPage() != null) {
int offset = (filterInCodeLogRequest.getPage() - 1) * filterInCodeLogRequest.getLimit();
PageHelper.offsetPage(offset, filterInCodeLogRequest.getLimit());
}
List<ThrImportLogEntity> data = thrImportLogDao.filterImportLog(filterInCodeLogRequest);
return data;
}
@Override
public boolean insertImportLog(ThrImportLogEntity thrImportLogEntity) {
return thrImportLogDao.insertImportLog(thrImportLogEntity);
}
@Override
public boolean updateImportLog(ThrImportLogEntity thrImportLogEntity) {
return thrImportLogDao.updateImportLog(thrImportLogEntity);
}
@Override
public boolean deleteById(String id) {
return thrImportLogDao.deleteById(id);
}
@Override
public ThrImportLogEntity selectByGenKey(String genKey) {
FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest();
filterUdiIpLogRequest.setGenKey(genKey);
List<ThrImportLogEntity> data = thrImportLogDao.filterImportLog(filterUdiIpLogRequest);
if (data != null && data.size() > 0) {
return data.get(0);
}
return null;
}
}

@ -7,6 +7,7 @@ import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.entity.basic.*;
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
import com.glxp.api.admin.req.basic.*;
import com.glxp.api.admin.res.basic.BasicUnitMaintainExportResponse;
import com.glxp.api.admin.res.basic.UdiRelevanceExportJsonResponse;
import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
import com.glxp.api.admin.service.basic.BasicUnitMaintainService;
@ -171,6 +172,25 @@ public class BasicGenExcelService {
corpExportLogService.updateCorpExportLog(corpExportLogEntity);
}
@Async
public void uploadCorpSmpJson(String genKey, BasicUnitMaintainExportResponse exportData) {
CorpExportLogEntity corpExportLogEntity = corpExportLogService.selectByGenKey(genKey);
String response = HttpClient.uCloudPost(spsSyncUrl + "/spssync/basic/corp/upload", exportData);
BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});
if (baseResponse.getCode() == 20000) {
corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
} else {
corpExportLogEntity.setRemark(baseResponse.getMessage());
corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
}
corpExportLogService.updateCorpExportLog(corpExportLogEntity);
}
@Async
public void exportUdiInfo(String genKey, UdiInfoExportRequest udiInfoExportRequest) {
UdiInfoExportLogEntity udiInfoExportLogEntity = udiInfoExportLogService.selectByGenKey(genKey);
@ -226,7 +246,8 @@ public class BasicGenExcelService {
@Async
public void uploadProductsSmpJson(String genKey, UdiRelevanceExportJsonResponse exportData) {
UdiInfoExportLogEntity udiInfoExportLogEntity = udiInfoExportLogService.selectByGenKey(genKey);
String response = HttpClient.uCloudPost(spsSyncUrl + "/udiwms/basic/products/upload", exportData);
// String response = HttpClient.uCloudPost(spsSyncUrl + "/udiwms/basic/products/upload", exportData);
String response = HttpClient.uCloudPost(spsSyncUrl + "/spssync/basic/udiinfo/upload", exportData);
BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});
if (baseResponse.getCode() == 20000) {
@ -238,6 +259,7 @@ public class BasicGenExcelService {
udiInfoExportLogService.updateUdiInfoExportLog(udiInfoExportLogEntity);
}
@Async
public void uploadProductsSmp(String genKey, UdiInfoExportRequest udiInfoExportRequest) {
UdiInfoExportLogEntity udiInfoExportLogEntity = udiInfoExportLogService.selectByGenKey(genKey);

@ -90,6 +90,32 @@ public class BasicGenJsonService {
corpExportLogService.updateCorpExportLog(corpExportLogEntity);
}
public BasicUnitMaintainExportResponse exportCorpJson(CorpsExportRequest corpsExportRequest) {
BasicUnitMaintainExportResponse exportData = new BasicUnitMaintainExportResponse();
List<BasicUnitMaintainEntity> unitMaintainEntities = new ArrayList<>();
if (corpsExportRequest.getIds() != null && corpsExportRequest.getIds().size() > 0) {
List<Integer> ids = corpsExportRequest.getIds();
ids.forEach(id -> {
BasicUnitMaintainFilterRequest request = new BasicUnitMaintainFilterRequest();
request.setId(id);
List<BasicUnitMaintainEntity> basicUnitMaintainEntities = basicUnitMaintainService.filterList(request);
unitMaintainEntities.addAll(basicUnitMaintainEntities);
getThrCorpList(exportData, basicUnitMaintainEntities);
});
} else { //一键导出
BasicUnitMaintainFilterRequest filterRequest = new BasicUnitMaintainFilterRequest();
BeanUtils.copyProperties(corpsExportRequest, filterRequest);
filterRequest.setPage(null);
List<BasicUnitMaintainEntity> basicUnitMaintainEntities = basicUnitMaintainService.filterList(filterRequest);
unitMaintainEntities.addAll(basicUnitMaintainEntities);
getThrCorpList(exportData, basicUnitMaintainEntities);
}
exportData.setCorpList(unitMaintainEntities);
return exportData;
}
/**
*
*

@ -0,0 +1,89 @@
package com.glxp.api.admin.thread;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.glxp.api.admin.constant.BasicProcessStatus;
import com.glxp.api.admin.entity.basic.BasicExportStatusEntity;
import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.api.admin.res.basic.BasicUnitMaintainExportResponse;
import com.glxp.api.admin.res.basic.UdiRelevanceExportJsonResponse;
import com.glxp.api.admin.res.inventory.InvWarehouseExportResponse;
import com.glxp.api.admin.service.basic.UdiInfoImportDetailService;
import com.glxp.api.admin.service.inventory.InvWarehouseService;
import com.glxp.api.admin.util.SpGetHttp;
import com.glxp.api.common.res.BaseResponse;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
@Service
public class DlBasicService {
@Resource
SpGetHttp spGetHttp;
@Resource
UdiInfoImportDetailService udiInfoImportDetailService;
@Resource
BasicCorpImportService basicCorpImportService;
@Resource
InvWarehouseService invWarehouseService;
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());
}
}
}
}
}
}

@ -0,0 +1,133 @@
package com.glxp.api.admin.thread;
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
import com.glxp.api.admin.service.info.SystemParamConfigService;
import com.glxp.api.admin.util.RedisUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@Service
public class DlUploadService {
@Resource
RedisUtil redisUtil;
@Resource
SystemParamConfigService systemParamConfigService;
@Resource
DlSpOrderService dlSpOrderService;
@Resource
DlBasicService dlBasicService;
final Logger logger = LoggerFactory.getLogger(DlUploadService.class);
//定时从上游下载数据----下载单据
public void dlOrder() {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("dl_order_status");
long timeInterval = Long.parseLong(systemParamConfigEntity.getParamValue()) * 60 * 1000;
long curTime = System.currentTimeMillis();
//任务一,定时下载供应商平台已完成单据
Long lastTime = (Long) redisUtil.get("DL_ORDER_STATUS");
if (lastTime == null) {
lastTime = System.currentTimeMillis();
redisUtil.set("DL_ORDER_STATUS", lastTime);
}
if (curTime - lastTime > timeInterval) {
logger.info("每分钟执行一次单据下载");
redisUtil.set("DL_ORDER_STATUS", curTime);
dlSpOrderService.dlOrdedrs();
}
}
//定时从上游下载数据----下载基础信息
public void dlBasicUdiInfo() {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("dl_basic_udiinfo_status");
long timeInterval = Long.parseLong(systemParamConfigEntity.getParamValue()) * 60 * 1000;
long curTime = System.currentTimeMillis();
Long lastTime = (Long) redisUtil.get("DL_BASIC_UDIINFO_STATUS");
if (lastTime == null) {
lastTime = System.currentTimeMillis();
redisUtil.set("DL_BASIC_UDIINFO_STATUS", lastTime);
} else if (curTime - lastTime > timeInterval) {
logger.info("每分钟执行一次基础信息下载");
redisUtil.set("DL_BASIC_UDIINFO_STATUS", curTime);
dlBasicService.dlBasicUdiInfo();
dlBasicService.dlBasicCorp();
dlBasicService.dlBasicInv();
}
}
//定时扫描本地共享文件夹---上传到上游
public void scanFolderUpload() {
SystemParamConfigEntity upConnect = systemParamConfigService.selectByParamKey("sync_upstream_enable");
if (upConnect.getParamValue().equals("1")) {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("dl_basic_udiinfo_status");
long timeInterval = Long.parseLong(systemParamConfigEntity.getParamValue()) * 60 * 1000;
long curTime = System.currentTimeMillis();
Long lastTime = (Long) redisUtil.get("DL_BASIC_UDIINFO_STATUS");
if (lastTime == null) {
lastTime = System.currentTimeMillis();
redisUtil.set("DL_ORDER_STATUS", lastTime);
} else if (curTime - lastTime > timeInterval) {
logger.info("每分钟执行一次基础信息下载");
redisUtil.set("DL_BASIC_UDIINFO_STATUS", curTime);
dlBasicService.dlBasicUdiInfo();
dlBasicService.dlBasicCorp();
dlBasicService.dlBasicInv();
}
}
}
//定时扫描本地共享文件夹---上传到上游
public void scanFolderDown() {
SystemParamConfigEntity upConnect = systemParamConfigService.selectByParamKey("sync_upstream_enable");
if (upConnect.getParamValue().equals("1")) {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("dl_basic_udiinfo_status");
long timeInterval = Long.parseLong(systemParamConfigEntity.getParamValue()) * 60 * 1000;
long curTime = System.currentTimeMillis();
Long lastTime = (Long) redisUtil.get("DL_BASIC_UDIINFO_STATUS");
if (lastTime == null) {
redisUtil.set("DL_BASIC_UDIINFO_STATUS", System.currentTimeMillis());
} else if (curTime - lastTime > timeInterval) {
logger.info("每分钟执行一次基础信息下载");
redisUtil.set("DL_BASIC_UDIINFO_STATUS", curTime);
dlBasicService.dlBasicUdiInfo();
dlBasicService.dlBasicCorp();
dlBasicService.dlBasicInv();
}
}
}
public void dlBasicCorp() {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("dl_basic_corp_status");
long timeInterval = Long.parseLong(systemParamConfigEntity.getParamValue()) * 60 * 1000;
long curTime = System.currentTimeMillis();
//任务一,定时下载供应商平台已完成单据
Long lastTime = (Long) redisUtil.get("DL_BASIC_CORP_STATUS");
if (lastTime == null) {
redisUtil.set("DL_BASIC_CORP_STATUS", System.currentTimeMillis());
} else if (curTime - lastTime > timeInterval) {
logger.info("每分钟执行一次单据下载");
redisUtil.set("DL_BASIC_CORP_STATUS", curTime);
dlBasicService.dlBasicCorp();
}
}
public void dlBasicInv() {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("dl_basic_inv_status");
long timeInterval = Long.parseLong(systemParamConfigEntity.getParamValue()) * 60 * 1000;
long curTime = System.currentTimeMillis();
//任务一,定时下载供应商平台已完成单据
Long lastTime = (Long) redisUtil.get("DL_BASIC_INV_STATUS");
if (lastTime == null) {
redisUtil.set("DL_BASIC_INV_STATUS", System.currentTimeMillis());
} else if (curTime - lastTime > timeInterval) {
logger.info("每分钟执行一次单据下载");
redisUtil.set("DL_BASIC_INV_STATUS", curTime);
dlBasicService.dlBasicInv();
}
}
}

@ -32,6 +32,9 @@ public class HeartTask implements SchedulingConfigurer {
@Resource
DlSpOrderService dlSpOrderService;
@Resource
DlUploadService dlUploadService;
@Override
public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
@ -52,19 +55,26 @@ public class HeartTask implements SchedulingConfigurer {
private void process() {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("dl_order_status");
long timeInterval = Long.parseLong(systemParamConfigEntity.getParamValue()) * 60 * 1000;
long curTime = System.currentTimeMillis();
//任务一,定时下载供应商平台已完成单据
Long lastTime = (Long) redisUtil.get(RedisContant.DL_ORDER_STATUS);
if (lastTime == null) {
redisUtil.set(RedisContant.DL_ORDER_STATUS, System.currentTimeMillis());
}
if (curTime - lastTime > timeInterval) {
logger.info("每分钟执行一次单据下载");
redisUtil.set(RedisContant.DL_ORDER_STATUS, curTime);
dlSpOrderService.dlOrdedrs();
SystemParamConfigEntity upConnect = systemParamConfigService.selectByParamKey("sync_upstream_enable");
if (upConnect.getParamValue().equals("1")) {
dlUploadService.dlOrder();
dlUploadService.dlBasicUdiInfo();
}
// SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("dl_order_status");
// long timeInterval = Long.parseLong(systemParamConfigEntity.getParamValue()) * 60 * 1000;
// long curTime = System.currentTimeMillis();
// //任务一,定时下载供应商平台已完成单据
// Long lastTime = (Long) redisUtil.get(RedisContant.DL_ORDER_STATUS);
// if (lastTime == null) {
// redisUtil.set(RedisContant.DL_ORDER_STATUS, System.currentTimeMillis());
// }
// if (curTime - lastTime > timeInterval) {
// logger.info("每分钟执行一次单据下载");
// redisUtil.set(RedisContant.DL_ORDER_STATUS, curTime);
// dlSpOrderService.dlOrdedrs();
// }
}
}

@ -822,17 +822,17 @@ public class IoTransInoutService {
stockOrderDetailEntity.setExpireDate(erpOrderEntity.getExpireDate());
// stockOrderDetailEntity.setYlqxzcrbarmc(erpOrderEntity.get());
if (erpOrderEntity.getCount() != null) {
stockOrderDetailEntity.setSweepCount(erpOrderEntity.getCount() + "");
stockOrderDetailEntity.setReCount(erpOrderEntity.getCount() + "");
stockOrderDetailEntity.setCount(erpOrderEntity.getCount() + "");
stockOrderDetailEntity.setSweepCount(erpOrderEntity.getCount());
stockOrderDetailEntity.setReCount(erpOrderEntity.getCount());
stockOrderDetailEntity.setCount(erpOrderEntity.getCount());
}
if (erpOrderEntity.getReCount() != null) {
stockOrderDetailEntity.setReCount(erpOrderEntity.getReCount() + "");
stockOrderDetailEntity.setReCount(erpOrderEntity.getReCount());
} else {
stockOrderDetailEntity.setReCount(erpOrderEntity.getCount() + "");
stockOrderDetailEntity.setReCount(erpOrderEntity.getCount());
}
if (erpOrderEntity.getErpCount() != null) {
stockOrderDetailEntity.setCount(erpOrderEntity.getErpCount() + "");
stockOrderDetailEntity.setCount(erpOrderEntity.getErpCount());
}
// FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
// filterUdiInfoRequest.setNameCode(erpOrderEntity.getNameCode());
@ -882,6 +882,7 @@ public class IoTransInoutService {
stockOrderFilterRequest.setBillNo(erpIds[i]);
StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest);
stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED);
stockOrderEntity.setOrderIdFk(orderEntity.getId());
stockOrderService.updateById(stockOrderEntity);
}
}

@ -2,6 +2,8 @@ package com.glxp.api.admin.thread;
import cn.hutool.core.io.file.FileWriter;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.glxp.api.admin.config.WebSocketServer;
import com.glxp.api.admin.constant.BasicProcessStatus;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
@ -13,6 +15,7 @@ import com.glxp.api.admin.httpclient.ErpBasicClient;
import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest;
import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest;
import com.glxp.api.admin.req.thrsys.FilterThrCorpRequest;
import com.glxp.api.admin.req.thrsys.PostThrCorpRequest;
import com.glxp.api.admin.req.thrsys.ThrCorpExportRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.ErpUnitsResponse;
@ -23,9 +26,11 @@ import com.glxp.api.admin.service.thrsys.ThrCorpImportLogService;
import com.glxp.api.admin.service.thrsys.ThrCorpService;
import com.glxp.api.admin.util.Constant;
import com.glxp.api.admin.util.ExcelUtil;
import com.glxp.api.admin.util.HttpClient;
import com.glxp.api.admin.util.RedisUtil;
import com.glxp.api.common.res.BaseResponse;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@ -50,7 +55,8 @@ public class ThrCorpsDlService {
ThrCorpExportLogService thrCorpExportLogService;
@Resource
private ThrCorpImportDetailService thrCorpImportDetailService;
@Value("${SPSYNC_IP}")
private String spsSyncUrl;
@Async
public void importSelectCorps(String genKey, List<ErpUnitsResponse> erpUnitsResponses, String thirdSys) {
@ -397,4 +403,62 @@ public class ThrCorpsDlService {
thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity);
}
@Async
public void uploadSmp(String genKey, ThrCorpExportRequest thrCorpExportRequest) {
ThrCorpExportLogEntity thrCorpExportLogEntity = thrCorpExportLogService.selectByGenKey(genKey);
List<ThrCorpEntity> exportData = new ArrayList<>();
PostThrCorpRequest postThrCorpRequest = new PostThrCorpRequest();
//选中导出
if (thrCorpExportRequest.getThrCorpEntities() != null && thrCorpExportRequest.getThrCorpEntities().size() > 0) {
List<ThrCorpEntity> corpEntities = thrCorpExportRequest.getThrCorpEntities();
exportData.addAll(corpEntities);
} else {//一键导出
//判断是否启用实时获取
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("corpUrl", thrCorpExportRequest.getThirdSys());
if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) {
thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
thrCorpExportLogEntity.setRemark("往来单位接口地址未定义");
thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity);
return;
}
if (!basicThirdSysDetailEntity.getEnabled()) {
thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
thrCorpExportLogEntity.setRemark("第三方往来单位服务未启用");
thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity);
return;
}
if (basicThirdSysDetailEntity.getFromType() == 0) {
//根据查询条件一键导出第三方系统往来单位
List<ThrCorpEntity> thrCorpEntities = exportCorps(thrCorpExportRequest);
exportData.addAll(thrCorpEntities);
} else {
//根据查询条件一键导出数据库往来单位
FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();
BeanUtils.copyProperties(thrCorpExportRequest, filterThrCorpRequest);
filterThrCorpRequest.setPage(null);
List<ThrCorpEntity> thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest);
exportData.addAll(thrCorpEntities);
}
}
postThrCorpRequest.setDatas(exportData);
postThrCorpRequest.setGenKey(genKey);
postThrCorpRequest.setThirdSys(thrCorpExportRequest.getThirdSys());
postThrCorpRequest.setUploadType("接口上传");
String response = HttpClient.uCloudPost(spsSyncUrl + "/spssync/thirdsys/corp/upload", postThrCorpRequest);
BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});
if (baseResponse.getCode() == 20000) {
thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
} else {
thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
}
thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity);
}
}

@ -1,5 +1,7 @@
package com.glxp.api.admin.thread;
import cn.hutool.core.io.file.FileWriter;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.glxp.api.admin.config.WebSocketServer;
@ -19,6 +21,7 @@ import com.glxp.api.admin.req.thrsys.PostThrOrderRequest;
import com.glxp.api.admin.req.thrsys.ThrOrderExportRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.inout.ErpOrderResponse;
import com.glxp.api.admin.res.thrsys.ThrOrderExportJsonResponse;
import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.api.admin.service.basic.BasicUnitMaintainService;
import com.glxp.api.admin.service.basic.BussinessTypeService;
@ -31,6 +34,7 @@ import com.glxp.api.admin.util.RedisUtil;
import com.glxp.api.common.res.BaseResponse;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@ -222,6 +226,199 @@ public class ThrOrdersDlService {
thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity);
}
@Async
public void genJsonFile(String genKey, ThrOrderExportRequest thrOrderExportRequest) {
ThrOrderExportJsonResponse thrOrderExportJsonResponse = new ThrOrderExportJsonResponse();
ThrOrderExportLogEntity thrOrderExportLogEntity = thrOrderExportLogService.selectByGenKey(genKey);
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(thrOrderExportRequest.getBillAction());
List<ErpOrderResponse> erpOrderResponses = thrOrderExportRequest.getErpOrderResponses();
//选中导出
if (thrOrderExportRequest.getErpOrderResponses() != null && thrOrderExportRequest.getErpOrderResponses().size() > 0) {
BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
bussinessTypeFilterRequest.setEnabled(true);
if (erpOrderResponses != null && erpOrderResponses.size() > 0) {
List<ThrOrderEntity> thrOrderEntities = new ArrayList<>();
List<ThrOrderDetailEntity> thrOrderDetailEntities = new ArrayList<>();
for (ErpOrderResponse erpOrderResponse : erpOrderResponses) {
ThrOrderEntity thrOrderEntity = new ThrOrderEntity();
BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity);
thrOrderEntities.add(thrOrderEntity);
if (erpOrderResponse.getSubErpOrders() != null && erpOrderResponse.getSubErpOrders().size() > 0) {
for (ErpOrderResponse.SubErpOrder subErpOrder : erpOrderResponse.getSubErpOrders()) {
ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity();
BeanUtils.copyProperties(subErpOrder, thrOrderDetailEntity);
thrOrderDetailEntities.add(thrOrderDetailEntity);
}
}
}
thrOrderExportJsonResponse.setThrOrderEntityList(thrOrderEntities);
thrOrderExportJsonResponse.setThrOrderDetailEntities(thrOrderDetailEntities);
}
} else {//一键导出
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("orderQueryUrl", bussinessTypeEntity.getThirdSysFk());
if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) {
thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
thrOrderExportLogEntity.setRemark("业务单据接口地址未定义");
thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity);
return;
}
if (!basicThirdSysDetailEntity.getEnabled() || basicThirdSysDetailEntity.getThirdSysFk() == null) {
thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
thrOrderExportLogEntity.setRemark("第三方业务单据服务未启用");
thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity);
return;
}
if (basicThirdSysDetailEntity.getFromType() == 0) {
FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
filterThrOrderRequest.setThirdSysFk(bussinessTypeEntity.getThirdSysFk());
BeanUtils.copyProperties(thrOrderExportRequest, filterThrOrderRequest);
erpOrderResponses = getThrOrders(filterThrOrderRequest);
if (erpOrderResponses != null && erpOrderResponses.size() > 0) {
List<ThrOrderEntity> thrOrderEntities = new ArrayList<>();
List<ThrOrderDetailEntity> thrOrderDetailEntities = new ArrayList<>();
for (ErpOrderResponse erpOrderResponse : erpOrderResponses) {
ThrOrderEntity thrOrderEntity = new ThrOrderEntity();
BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity);
thrOrderEntities.add(thrOrderEntity);
if (erpOrderResponse.getSubErpOrders() != null && erpOrderResponse.getSubErpOrders().size() > 0) {
for (ErpOrderResponse.SubErpOrder subErpOrder : erpOrderResponse.getSubErpOrders()) {
ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity();
BeanUtils.copyProperties(subErpOrder, thrOrderDetailEntity);
thrOrderDetailEntities.add(thrOrderDetailEntity);
}
}
}
thrOrderExportJsonResponse.setThrOrderEntityList(thrOrderEntities);
thrOrderExportJsonResponse.setThrOrderDetailEntities(thrOrderDetailEntities);
}
} else {
FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
BeanUtils.copyProperties(thrOrderExportRequest, filterThrOrderRequest);
List<ThrOrderEntity> thrOrderEntities = thrOrderService.filterThrOrder(filterThrOrderRequest);
List<ThrOrderDetailEntity> results = new ArrayList<>();
for (ThrOrderEntity thrOrderEntity : thrOrderEntities) {
FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest();
filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + "");
List<ThrOrderDetailEntity> thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest);
if (thrOrderDetailEntities != null) {
results.addAll(thrOrderDetailEntities);
}
}
thrOrderExportJsonResponse.setThrOrderEntityList(thrOrderEntities);
thrOrderExportJsonResponse.setThrOrderDetailEntities(results);
}
}
FileWriter writer = new FileWriter(thrOrderExportLogEntity.getFilePath());
writer.write(JSONUtil.toJsonStr(thrOrderExportJsonResponse));
thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity);
}
@Async
public void uploadSpssync(String genKey, ThrOrderExportRequest thrOrderExportRequest) {
ThrOrderExportJsonResponse thrOrderExportJsonResponse = new ThrOrderExportJsonResponse();
ThrOrderExportLogEntity thrOrderExportLogEntity = thrOrderExportLogService.selectByGenKey(genKey);
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(thrOrderExportRequest.getBillAction());
List<ErpOrderResponse> erpOrderResponses = thrOrderExportRequest.getErpOrderResponses();
//选中导出
if (thrOrderExportRequest.getErpOrderResponses() != null && thrOrderExportRequest.getErpOrderResponses().size() > 0) {
BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
bussinessTypeFilterRequest.setEnabled(true);
if (erpOrderResponses != null && erpOrderResponses.size() > 0) {
List<ThrOrderEntity> thrOrderEntities = new ArrayList<>();
List<ThrOrderDetailEntity> thrOrderDetailEntities = new ArrayList<>();
for (ErpOrderResponse erpOrderResponse : erpOrderResponses) {
ThrOrderEntity thrOrderEntity = new ThrOrderEntity();
BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity);
thrOrderEntities.add(thrOrderEntity);
if (erpOrderResponse.getSubErpOrders() != null && erpOrderResponse.getSubErpOrders().size() > 0) {
for (ErpOrderResponse.SubErpOrder subErpOrder : erpOrderResponse.getSubErpOrders()) {
ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity();
BeanUtils.copyProperties(subErpOrder, thrOrderDetailEntity);
thrOrderDetailEntities.add(thrOrderDetailEntity);
}
}
}
thrOrderExportJsonResponse.setThrOrderEntityList(thrOrderEntities);
thrOrderExportJsonResponse.setThrOrderDetailEntities(thrOrderDetailEntities);
}
} else {//一键导出
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("orderQueryUrl", bussinessTypeEntity.getThirdSysFk());
if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) {
thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
thrOrderExportLogEntity.setRemark("业务单据接口地址未定义");
thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity);
return;
}
if (!basicThirdSysDetailEntity.getEnabled() || basicThirdSysDetailEntity.getThirdSysFk() == null) {
thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
thrOrderExportLogEntity.setRemark("第三方业务单据服务未启用");
thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity);
return;
}
if (basicThirdSysDetailEntity.getFromType() == 0) {
FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
filterThrOrderRequest.setThirdSysFk(bussinessTypeEntity.getThirdSysFk());
BeanUtils.copyProperties(thrOrderExportRequest, filterThrOrderRequest);
erpOrderResponses = getThrOrders(filterThrOrderRequest);
if (erpOrderResponses != null && erpOrderResponses.size() > 0) {
List<ThrOrderEntity> thrOrderEntities = new ArrayList<>();
List<ThrOrderDetailEntity> thrOrderDetailEntities = new ArrayList<>();
for (ErpOrderResponse erpOrderResponse : erpOrderResponses) {
ThrOrderEntity thrOrderEntity = new ThrOrderEntity();
BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity);
thrOrderEntities.add(thrOrderEntity);
if (erpOrderResponse.getSubErpOrders() != null && erpOrderResponse.getSubErpOrders().size() > 0) {
for (ErpOrderResponse.SubErpOrder subErpOrder : erpOrderResponse.getSubErpOrders()) {
ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity();
BeanUtils.copyProperties(subErpOrder, thrOrderDetailEntity);
thrOrderDetailEntities.add(thrOrderDetailEntity);
}
}
}
thrOrderExportJsonResponse.setThrOrderEntityList(thrOrderEntities);
thrOrderExportJsonResponse.setThrOrderDetailEntities(thrOrderDetailEntities);
}
} else {
FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
BeanUtils.copyProperties(thrOrderExportRequest, filterThrOrderRequest);
List<ThrOrderEntity> thrOrderEntities = thrOrderService.filterThrOrder(filterThrOrderRequest);
List<ThrOrderDetailEntity> results = new ArrayList<>();
for (ThrOrderEntity thrOrderEntity : thrOrderEntities) {
FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest();
filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + "");
List<ThrOrderDetailEntity> thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest);
if (thrOrderDetailEntities != null) {
results.addAll(thrOrderDetailEntities);
}
}
thrOrderExportJsonResponse.setThrOrderEntityList(thrOrderEntities);
thrOrderExportJsonResponse.setThrOrderDetailEntities(results);
}
}
thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity);
String response = HttpClient.uCloudPost(spsSyncUrl + "/spssync/thirdsys/order/upload", thrOrderExportJsonResponse);
BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});
if (baseResponse.getCode() == 20000) {
thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
} else {
thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
}
thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity);
}
public String getName(List<BussinessTypeEntity> bussinessTypeEntities, String action) {
for (BussinessTypeEntity bussinessTypeEntity : bussinessTypeEntities) {
if (bussinessTypeEntity.getAction().equals(action)) {
@ -309,7 +506,8 @@ public class ThrOrdersDlService {
}
public int getOrders(int page, int limit, String orderUrl, String thirdSys, ThrOrderImportLogEntity thrOrderImportLogEntity, String action, FilterThrOrderRequest filterThrOrderRequest) {
public int getOrders(int page, int limit, String orderUrl, String thirdSys, ThrOrderImportLogEntity
thrOrderImportLogEntity, String action, FilterThrOrderRequest filterThrOrderRequest) {
if (filterThrOrderRequest == null)
filterThrOrderRequest = new FilterThrOrderRequest();
filterThrOrderRequest.setPage(page);
@ -432,19 +630,20 @@ public class ThrOrdersDlService {
return erpOrderResponseList;
}
public List<ErpOrderResponse> getThrOrders(int page, int limit, String orderQueryUrl, FilterThrOrderRequest filterThrOrderRequest) {
public List<ErpOrderResponse> getThrOrders(int page, int limit, String orderQueryUrl, FilterThrOrderRequest
filterThrOrderRequest) {
FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
BeanUtils.copyProperties(filterThrOrderRequest, filterOrderRequest);
filterOrderRequest.setPage(page);
filterOrderRequest.setLimit(limit);
BaseResponse<PageSimpleResponse<ErpOrderResponse>> responseBaseResponse = new ErpOrderClient(orderQueryUrl).getErpOrderResponse(filterOrderRequest);
if (responseBaseResponse != null && responseBaseResponse.getCode() == 20000) {
}
List<ErpOrderResponse> erpOrderResponses = responseBaseResponse.getData().getList();
if (erpOrderResponses != null && erpOrderResponses.size() > 0) {
return erpOrderResponses;
List<ErpOrderResponse> erpOrderResponses = responseBaseResponse.getData().getList();
if (erpOrderResponses != null && erpOrderResponses.size() > 0) {
return erpOrderResponses;
}
}
return null;
}

@ -286,6 +286,85 @@ public class ThrProductsDlService {
thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity);
}
//上传SMP
@Async
public void uploadSpssync(String genKey, ThrProductsExportRequest thrProductsExportRequest) {
PostThrProductsRequest postThrProductsRequest = new PostThrProductsRequest();
List<ErpProductsResponse> datas = new ArrayList<>();
ThrProductsExportLogEntity thrProductsExportLogEntity = thrProductsExportLogService.selectByGenKey(genKey);
//选中导出
if (thrProductsExportRequest.getThrProductsEntities() != null && thrProductsExportRequest.getThrProductsEntities().size() > 0) {
List<ThrProductsEntity> thrProductsEntities = thrProductsExportRequest.getThrProductsEntities();
List<ErpProductsResponse> lists = thrProductsEntities.stream().map(
item -> {
ErpProductsResponse thrProductsEntity = new ErpProductsResponse();
BeanUtils.copyProperties(item, thrProductsEntity);
return thrProductsEntity;
}
).collect(Collectors.toList());
datas.addAll(lists);
postThrProductsRequest.setDatas(datas);
postThrProductsRequest.setGenKey(genKey);
postThrProductsRequest.setThirdSys(thrProductsExportRequest.getThirdSys());
postThrProductsRequest.setUploadType("接口上传");
} else {//一键导出
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thrProductsExportRequest.getThirdSys());
if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) {
thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
thrProductsExportLogEntity.setRemark("产品信息接口未定义!");
thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity);
return;
}
if (!basicThirdSysDetailEntity.getEnabled()) {
thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
thrProductsExportLogEntity.setRemark("第三方产品信息服务未启用!");
thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity);
return;
}
List<ThrProductsEntity> thrProductsEntities;
if (basicThirdSysDetailEntity.getFromType() == 0) {
FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
BeanUtils.copyProperties(thrProductsExportRequest, filterThrProductsRequest);
thrProductsEntities = exportThrProducts(filterThrProductsRequest);
} else {
FilterThrProductsRequest filterThrInvProductsRequest = new FilterThrProductsRequest();
thrProductsEntities = thrProductsService.filterThrProductsRequest(filterThrInvProductsRequest);
}
if (thrProductsEntities != null) {
List<ErpProductsResponse> lists = thrProductsEntities.stream().map(
item -> {
ErpProductsResponse thrProductsEntity = new ErpProductsResponse();
BeanUtils.copyProperties(item, thrProductsEntity);
return thrProductsEntity;
}
).collect(Collectors.toList());
datas.addAll(lists);
postThrProductsRequest.setDatas(datas);
postThrProductsRequest.setGenKey(genKey);
postThrProductsRequest.setThirdSys(thrProductsExportRequest.getThirdSys());
postThrProductsRequest.setUploadType("接口上传");
}
}
String response = HttpClient.uCloudPost(spsSyncUrl + "/spssync/thirdsys/products/upload", postThrProductsRequest);
BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
});
if (baseResponse.getCode() == 20000) {
thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
} else {
thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
}
thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity);
}
// //接收第三方上传或文件导入数据
@Async
public void insertData(String genKey, List<ErpProductsResponse> erpProductsResponses, String thirdSys) {

@ -370,8 +370,8 @@ public class ITextPDFUtils {
int reCountTotal = 0;
for (int i = 0; i < stockOrderDetailEntityList.size(); i++) {
StockOrderDetailEntity stockOrderDetailEntity = stockOrderDetailEntityList.get(i);
countTotal = countTotal + Integer.parseInt(stockOrderDetailEntity.getCount());
reCountTotal = reCountTotal + Integer.parseInt(stockOrderDetailEntity.getReCount());
countTotal = countTotal + stockOrderDetailEntity.getCount();
reCountTotal = reCountTotal + stockOrderDetailEntity.getReCount();
}
for (int i = 0; i < page; i++) {
@ -482,12 +482,12 @@ public class ITextPDFUtils {
expireDateList.add(list7);
//订单数量
List<String> list8 = new ArrayList<String>();
countSubtotal = countSubtotal + Integer.parseInt(stockOrderDetailEntity.getCount());
countSubtotal = countSubtotal + stockOrderDetailEntity.getCount();
list8.add(stockOrderDetailEntity.getCount() + "");
countList.add(list8);
//配货数量
List<String> list9 = new ArrayList<String>();
reCountSubtotal = reCountSubtotal + Integer.parseInt(stockOrderDetailEntity.getReCount());
reCountSubtotal = reCountSubtotal +stockOrderDetailEntity.getReCount();
list9.add(stockOrderDetailEntity.getReCount() + "");
reCountList.add(list9);
}

@ -2,9 +2,12 @@ package com.glxp.api.admin.util;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.glxp.api.admin.entity.basic.BasicExportStatusEntity;
import com.glxp.api.admin.entity.inout.IOOrderStatusEntity;
import com.glxp.api.admin.httpclient.UHttpClient;
import com.glxp.api.admin.req.basic.BasicExportStatusRequest;
import com.glxp.api.admin.req.inout.OrderStatusFilterRequest;
import com.glxp.api.admin.req.sync.BasicDataFilterRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.inout.DlOrderResponse;
import com.glxp.api.common.res.BaseResponse;
@ -66,4 +69,46 @@ public class SpGetHttp {
return response;
}
public BaseResponse<List<BasicExportStatusEntity>> getBasicStatus(String type) {
Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("type", type);
String response = UHttpClient.mipsGet(spsSyncUrl + "/spssync/basic/udiinfo/getStatus", paramMap);
try {
BaseResponse<List<BasicExportStatusEntity>> data =
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<BasicExportStatusEntity>>>() {
});
return data;
} catch (Exception e) {
e.printStackTrace();
return ResultVOUtils.error(500, "下载失败!");
}
}
//获取耗材字典
public String getBasicData(Integer id, int type) {
BasicExportStatusRequest basicExportStatusRequest = new BasicExportStatusRequest();
basicExportStatusRequest.setId(id);
basicExportStatusRequest.setType(type);
String result = UHttpClient.postJson(spsSyncUrl + "/spssync/basic/udiinfo/downloadByStatus", basicExportStatusRequest);
// BaseResponse<UdiRelevanceExportJsonResponse> response =
// JSONObject.parseObject(result, new TypeReference<BaseResponse<UdiRelevanceExportJsonResponse>>() {
// });
return result;
}
public BaseResponse<String> postBasicStatus(Integer id) {
BasicExportStatusRequest basicStatusFilterRequest = new BasicExportStatusRequest();
basicStatusFilterRequest.setId(id);
String result = UHttpClient.postJson(spsSyncUrl + "/spssync/basic/udiinfo/deleteByStatus", basicStatusFilterRequest);
BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
});
return response;
}
}

@ -32,7 +32,7 @@ SPSYNC_IP=http://127.0.0.1:9989
#UDI_SERVER_URL=http://127.0.0.1:9995
##端口号
# Redis数据库索引默认为0
spring.redis.database=0
spring.redis.database=1
# Redis服务器地址
spring.redis.host=127.0.0.1
# Redis服务器连接端口

@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<fontFamilies>
<fontFamily name="华文宋体">
<normal>fonts/STSONG.TTF</normal>
<bold>fonts/STSONG.TTF</bold>
<italic>fonts/STSONG.TTF</italic>
<boldItalic>fonts/STSONG.TTF</boldItalic>
<pdfEncoding>Identity-H</pdfEncoding>
<pdfEmbedded>true</pdfEmbedded>
<exportFonts>
<export key="net.sf.jasperreports.html">'华文宋体', Arial, Helvetica, sans-serif</export>
<export key="net.sf.jasperreports.xhtml">'华文宋体', Arial, Helvetica, sans-serif</export>
</exportFonts>
</fontFamily>
<fontFamily name="微软雅黑">
<normal>fonts/mircblack.ttf</normal>
<bold>fonts/mircblack.ttf</bold>
<italic>fonts/mircblack.ttf</italic>
<boldItalic>fonts/mircblack.ttf</boldItalic>
<pdfEncoding>Identity-H</pdfEncoding>
<pdfEmbedded>true</pdfEmbedded>
<exportFonts>
<export key="net.sf.jasperreports.html">'微软雅黑', Arial, Helvetica, sans-serif</export>
<export key="net.sf.jasperreports.xhtml">'微软雅黑', Arial, Helvetica, sans-serif</export>
</exportFonts>
</fontFamily>
<fontFamily name="宋体">
<normal>fonts/simsun.ttf</normal>
<bold>fonts/simsun.ttf</bold>
<italic>fonts/simsun.ttf</italic>
<boldItalic>fonts/simsun.ttf</boldItalic>
<pdfEncoding>Identity-H</pdfEncoding>
<pdfEmbedded>true</pdfEmbedded>
<exportFonts>
<export key="net.sf.jasperreports.html">'宋体', Arial, Helvetica, sans-serif</export>
<export key="net.sf.jasperreports.xhtml">'宋体', Arial, Helvetica, sans-serif</export>
</exportFonts>
</fontFamily>
<fontFamily name="黑体">
<normal>fonts/heiti.ttf</normal>
<bold>fonts/heiti.ttf</bold>
<italic>fonts/heiti.ttf</italic>
<boldItalic>fonts/heiti.ttf</boldItalic>
<pdfEncoding>Identity-H</pdfEncoding>
<pdfEmbedded>true</pdfEmbedded>
<exportFonts>
<export key="net.sf.jasperreports.html">'黑体', Arial, Helvetica, sans-serif</export>
<export key="net.sf.jasperreports.xhtml">'黑体', Arial, Helvetica, sans-serif</export>
</exportFonts>
</fontFamily>
</fontFamilies>

@ -0,0 +1,2 @@
net.sf.jasperreports.extension.registry.factory.simple.font.families=net.sf.jasperreports.engine.fonts.SimpleFontExtensionsRegistryFactory
net.sf.jasperreports.extension.simple.font.families.lobstertwo=fonts/fonts.xml

@ -0,0 +1,179 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 6.5.1 -->
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Blank_A4_1" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="ebb5aab8-f051-4bd8-bded-1a51a76d9c3b">
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
<queryString language="json">
<![CDATA[data]]>
</queryString>
<field name="id" class="java.lang.String"/>
<field name="udiCode" class="java.lang.String"/>
<field name="nameCode" class="java.lang.String"/>
<field name="cpmctymc" class="java.lang.String"/>
<field name="batchNo" class="java.lang.String"/>
<field name="produceDate" class="java.lang.String"/>
<field name="expireDate" class="java.lang.String"/>
<field name="ggxh" class="java.lang.String"/>
<field name="ylqxzcrbarmc" class="java.lang.String"/>
<field name="zczbhhzbzpzbh" class="java.lang.String"/>
<field name="spaceCode" class="java.lang.String"/>
<field name="spaceName" class="java.lang.String"/>
<group name="Group1" isStartNewPage="true">
<groupExpression><![CDATA[$F{id}]]></groupExpression>
<groupHeader>
<band/>
</groupHeader>
<groupFooter>
<band/>
</groupFooter>
</group>
<background>
<band splitType="Stretch"/>
</background>
<title>
<band splitType="Stretch"/>
</title>
<pageHeader>
<band splitType="Stretch"/>
</pageHeader>
<columnHeader>
<band splitType="Stretch"/>
</columnHeader>
<detail>
<band height="269" splitType="Stretch">
<textField isBlankWhenNull="true">
<reportElement x="76" y="24" width="136" height="20" uuid="52ef5da3-ec39-4066-8050-f7525f74a811"/>
<textElement>
<font fontName="Arial"/>
</textElement>
<textFieldExpression><![CDATA[$F{batchNo}]]></textFieldExpression>
<patternExpression><![CDATA[$F{batchNo}]]></patternExpression>
</textField>
<staticText>
<reportElement x="22" y="24" width="50" height="20" uuid="0cf4dca2-498c-4ee3-8220-bf22d83e7143"/>
<textElement textAlignment="Right">
<font fontName="华文宋体"/>
</textElement>
<text><![CDATA[产品批号:]]></text>
</staticText>
<textField isBlankWhenNull="true">
<reportElement x="28" y="50" width="190" height="14" uuid="da5b32a2-7feb-4c0a-ab3a-cb7c6c53db12"/>
<textElement>
<font fontName="Arial"/>
</textElement>
<textFieldExpression><![CDATA[$F{udiCode}]]></textFieldExpression>
<patternExpression><![CDATA[$F{udiCode}]]></patternExpression>
</textField>
<staticText>
<reportElement x="22" y="73" width="49" height="19" uuid="7919a800-0d64-439a-8087-03c1c9aec723"/>
<textElement textAlignment="Right">
<font fontName="华文宋体"/>
</textElement>
<text><![CDATA[生产日期:]]></text>
</staticText>
<staticText>
<reportElement x="22" y="98" width="49" height="20" uuid="087847cc-7217-471b-8008-da2f31d54c72"/>
<textElement textAlignment="Right">
<font fontName="华文宋体"/>
</textElement>
<text><![CDATA[失效日期:]]></text>
</staticText>
<textField isBlankWhenNull="true">
<reportElement x="76" y="72" width="136" height="19" uuid="af99e057-78e6-4f1c-abce-8e9edd0fcd7e"/>
<textElement>
<font fontName="Arial"/>
</textElement>
<textFieldExpression><![CDATA[$F{produceDate}]]></textFieldExpression>
<patternExpression><![CDATA[$F{produceDate}]]></patternExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="76" y="98" width="134" height="20" uuid="70419277-91ad-43dc-92ae-8d2cfc071c5d"/>
<textElement>
<font fontName="Arial"/>
</textElement>
<textFieldExpression><![CDATA[$F{expireDate}]]></textFieldExpression>
<patternExpression><![CDATA[$F{expireDate}]]></patternExpression>
</textField>
<componentElement>
<reportElement x="222" y="14" width="90" height="90" uuid="8aab5c5a-5cd9-4fc3-943e-26a659e7e2c4"/>
<jr:DataMatrix xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd">
<jr:codeExpression><![CDATA["123456789"]]></jr:codeExpression>
<jr:patternExpression><![CDATA[$F{udiCode}]]></jr:patternExpression>
</jr:DataMatrix>
</componentElement>
<staticText>
<reportElement x="23" y="174" width="48" height="16" uuid="802e13c8-d34e-4dc9-8d77-abd57d3fe305"/>
<textElement textAlignment="Right">
<font fontName="华文宋体"/>
</textElement>
<text><![CDATA[生产企业:]]></text>
</staticText>
<textField isBlankWhenNull="true">
<reportElement x="76" y="173" width="234" height="23" uuid="0eb681fd-be5a-46bc-a417-55bdcdd0f024"/>
<textFieldExpression><![CDATA[$F{ylqxzcrbarmc}]]></textFieldExpression>
<patternExpression><![CDATA[$F{ylqxzcrbarmc}]]></patternExpression>
</textField>
<staticText>
<reportElement x="22" y="124" width="50" height="19" uuid="1600efd6-e53c-4498-a21f-39d288c979a3"/>
<textElement textAlignment="Right">
<font fontName="华文宋体"/>
</textElement>
<text><![CDATA[产品名称:]]></text>
</staticText>
<textField isBlankWhenNull="true">
<reportElement x="76" y="124" width="234" height="19" uuid="33d41506-86c3-431f-84e8-18c20ffe293b"/>
<textFieldExpression><![CDATA[$F{cpmctymc}]]></textFieldExpression>
<patternExpression><![CDATA[$F{cpmctymc}]]></patternExpression>
</textField>
<staticText>
<reportElement x="22" y="148" width="50" height="20" uuid="28f00009-ce52-4e04-9f4c-4fb894c027a4"/>
<textElement textAlignment="Right">
<font fontName="华文宋体"/>
</textElement>
<text><![CDATA[规格型号:]]></text>
</staticText>
<textField isBlankWhenNull="true">
<reportElement x="76" y="147" width="234" height="20" uuid="a5924840-ccad-4f8f-a174-5de7a38315f5"/>
<textFieldExpression><![CDATA[$F{ggxh}]]></textFieldExpression>
<patternExpression><![CDATA[$F{ggxh}]]></patternExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="75" y="197" width="237" height="26" uuid="f24409d0-4e24-46f5-b881-283627534c02"/>
<textFieldExpression><![CDATA[$F{zczbhhzbzpzbh}]]></textFieldExpression>
<patternExpression><![CDATA[$F{zczbhhzbzpzbh}]]></patternExpression>
</textField>
<staticText>
<reportElement x="22" y="196" width="49" height="21" uuid="935137fa-d982-46f3-8375-91ff48e9ceb4"/>
<textElement textAlignment="Right">
<font fontName="华文宋体"/>
</textElement>
<text><![CDATA[注册证号:]]></text>
</staticText>
<staticText>
<reportElement x="22" y="222" width="49" height="14" uuid="9ee0ff34-6637-4a3c-bb1a-44f2ab25c498"/>
<textElement textAlignment="Right">
<font fontName="华文宋体"/>
</textElement>
<text><![CDATA[货位:]]></text>
</staticText>
<textField isBlankWhenNull="true">
<reportElement x="76" y="222" width="74" height="24" uuid="dd48b293-6833-4125-86d1-6e7e7facf91d"/>
<textFieldExpression><![CDATA[$F{spaceCode}]]></textFieldExpression>
<patternExpression><![CDATA[$F{spaceCode}]]></patternExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="155" y="224" width="155" height="23" uuid="51a77544-b235-4234-967d-b235ad3a4958"/>
<textFieldExpression><![CDATA[$F{spaceName}]]></textFieldExpression>
<patternExpression><![CDATA[$F{spaceName}]]></patternExpression>
</textField>
</band>
</detail>
<columnFooter>
<band splitType="Stretch"/>
</columnFooter>
<pageFooter>
<band splitType="Stretch"/>
</pageFooter>
<summary>
<band height="1" splitType="Stretch"/>
</summary>
</jasperReport>

@ -0,0 +1,298 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 6.5.1.final using JasperReports Library version 6.5.1 -->
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="order_print_1" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="0e03c1b8-3ccd-4d9e-bf8b-ff9afa08cdba">
<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
<queryString language="json">
<![CDATA[data]]>
</queryString>
<field name="id" class="java.lang.String"/>
<field name="title" class="java.lang.String"/>
<field name="billNo" class="java.lang.String"/>
<field name="corpName" class="java.lang.String"/>
<field name="billDate" class="java.lang.String"/>
<field name="productName" class="java.lang.String"/>
<field name="spec" class="java.lang.String"/>
<field name="batchNo" class="java.lang.String"/>
<field name="productDate" class="java.lang.String"/>
<field name="expireDate" class="java.lang.String"/>
<field name="count" class="java.lang.String"/>
<field name="reCount" class="java.lang.String"/>
<field name="total" class="java.lang.String"/>
<field name="sweepCount" class="java.lang.String"/>
<field name="ylqxzcrbarmc" class="java.lang.String"/>
<field name="zczbhhzbzpzbh" class="java.lang.String"/>
<field name="billBy" class="java.lang.String"/>
<background>
<band splitType="Stretch"/>
</background>
<title>
<band height="98" splitType="Stretch">
<textField isBlankWhenNull="true">
<reportElement x="40" y="8" width="504" height="30" uuid="792264b3-8a9c-42fe-ba28-ffc580771931"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{title}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="0" y="47" width="50" height="24" uuid="5ba70caa-24aa-45b4-996c-46c1e4500475"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="华文宋体"/>
</textElement>
<text><![CDATA[单号:]]></text>
</staticText>
<textField isBlankWhenNull="true">
<reportElement x="56" y="47" width="124" height="24" uuid="92a15708-763f-496c-ab77-55130f8f4e1c"/>
<textElement verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{billNo}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="401" y="70" width="50" height="24" uuid="198d781d-8f0d-4b91-9eb9-eb845e506d3b"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="华文宋体"/>
</textElement>
<text><![CDATA[开单日期:]]></text>
</staticText>
<textField isBlankWhenNull="true">
<reportElement x="459" y="70" width="100" height="24" uuid="006f1842-d859-4f94-84be-6601ad8f972a"/>
<textElement verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{billDate}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="-8" y="72" width="58" height="24" uuid="3b263493-0ad2-4c4f-b101-18781d92378f"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="华文宋体"/>
</textElement>
<text><![CDATA[送货单位:]]></text>
</staticText>
<textField isBlankWhenNull="true">
<reportElement x="56" y="72" width="337" height="24" uuid="c7ff1896-1c78-44fd-a795-7005efd9e190"/>
<textElement verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{corpName}]]></textFieldExpression>
</textField>
</band>
</title>
<pageHeader>
<band splitType="Stretch"/>
</pageHeader>
<columnHeader>
<band height="49" splitType="Stretch">
<staticText>
<reportElement x="-8" y="12" width="100" height="30" uuid="41db35e4-06f8-4b77-bfa4-e3c568be09ca"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font fontName="华文宋体"/>
</textElement>
<text><![CDATA[名称]]></text>
</staticText>
<staticText>
<reportElement x="94" y="12" width="93" height="30" uuid="3c9fcc88-074d-4843-83c0-d93db6d80bc8"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font fontName="华文宋体"/>
</textElement>
<text><![CDATA[规格]]></text>
</staticText>
<staticText>
<reportElement x="190" y="11" width="80" height="30" uuid="a56f660a-60ff-49c4-8c9e-8ac3fd27e34b"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font fontName="华文宋体"/>
</textElement>
<text><![CDATA[批次号]]></text>
</staticText>
<staticText>
<reportElement x="340" y="10" width="53" height="30" uuid="3c0243e8-3cb1-4a1c-aaff-54c6cea92e8d"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font fontName="华文宋体"/>
</textElement>
<text><![CDATA[生产日期]]></text>
</staticText>
<staticText>
<reportElement x="400" y="11" width="51" height="30" uuid="1dceea9b-b390-449f-a18b-1f89d38d52f6"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font fontName="华文宋体"/>
</textElement>
<text><![CDATA[失效日期]]></text>
</staticText>
<staticText>
<reportElement x="458" y="9" width="102" height="14" uuid="e0c0b310-25b9-4151-8281-b67841bf3534"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font fontName="华文宋体"/>
</textElement>
<text><![CDATA[注册/备案人]]></text>
</staticText>
<staticText>
<reportElement x="458" y="26" width="102" height="14" uuid="9872692e-de08-4d42-96e8-6038ce25ce4a"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font fontName="华文宋体"/>
</textElement>
<text><![CDATA[注册/备案证号]]></text>
</staticText>
<staticText>
<reportElement x="275" y="10" width="57" height="30" uuid="e826196f-97bd-4488-b33e-45e90effcd2e"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font fontName="华文宋体"/>
</textElement>
<text><![CDATA[数量]]></text>
</staticText>
<line>
<reportElement x="-11" y="6" width="581" height="1" uuid="10571ec0-4ba7-4733-98f1-b4bf15b3a19c"/>
</line>
<line>
<reportElement x="-11" y="7" width="1" height="41" uuid="a4f700d8-3b2a-4e94-aaa9-7370f14766fc"/>
</line>
<line>
<reportElement x="93" y="7" width="1" height="41" uuid="43915dda-87ae-4713-81f4-b30cc741a80a"/>
</line>
<line>
<reportElement x="190" y="6" width="1" height="41" uuid="2e815313-27e9-422d-b0a9-90df9cf5a977"/>
</line>
<line>
<reportElement x="271" y="6" width="1" height="41" uuid="1a9cbd88-78d2-4040-a82f-b69a61c4242a"/>
</line>
<line>
<reportElement x="335" y="6" width="1" height="41" uuid="5c7e2c47-9770-4b5a-8a8a-01e9ea7780dc"/>
</line>
<line>
<reportElement x="397" y="7" width="1" height="41" uuid="2df14fa5-fafa-407f-9bd5-c3c522de39b5"/>
</line>
<line>
<reportElement x="454" y="7" width="1" height="41" uuid="36a5686f-c202-4efb-8e5b-b9de420a6139"/>
</line>
<line>
<reportElement x="570" y="7" width="1" height="41" uuid="f9524faf-9099-44a3-9593-851faa0b2595"/>
</line>
</band>
</columnHeader>
<detail>
<band height="46" splitType="Stretch">
<textField isBlankWhenNull="true">
<reportElement positionType="FixRelativeToBottom" stretchType="RelativeToTallestObject" x="-10" y="10" width="100" height="20" uuid="d9c60974-1460-4233-8d27-19e61f63d3e9"/>
<textElement verticalAlignment="Middle">
<font fontName="华文宋体"/>
</textElement>
<textFieldExpression><![CDATA[$F{productName}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="92" y="11" width="95" height="20" uuid="d0cdd9db-c7be-4147-85b9-e3caa6742d4f"/>
<textElement verticalAlignment="Middle">
<font fontName="华文宋体"/>
</textElement>
<textFieldExpression><![CDATA[$F{spec}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="193" y="10" width="77" height="20" uuid="c5d2818c-0d96-40c1-ae67-6f697a35cab9"/>
<textElement verticalAlignment="Middle">
<font fontName="Arial"/>
</textElement>
<textFieldExpression><![CDATA[$F{batchNo}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="275" y="11" width="57" height="20" uuid="d2e85539-0930-40c8-b45e-508e899c0f70"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="Arial"/>
</textElement>
<textFieldExpression><![CDATA[$F{count}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="340" y="11" width="53" height="20" uuid="b34e1882-6bd9-426c-a042-83f5d4fa98ac"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{productDate}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="399" y="10" width="53" height="20" uuid="8e364374-1761-4a40-af72-0b3cac70e2cf"/>
<textElement textAlignment="Center" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{expireDate}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="459" y="1" width="111" height="20" uuid="3984093f-f1d5-4f00-b73f-be98d29f6967"/>
<textElement verticalAlignment="Middle">
<font fontName="华文宋体"/>
</textElement>
<textFieldExpression><![CDATA[$F{ylqxzcrbarmc}]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
<reportElement x="460" y="21" width="111" height="20" uuid="e63a2c61-14b4-4999-b5de-51ea520f0752"/>
<textElement verticalAlignment="Middle">
<font fontName="华文宋体"/>
</textElement>
<textFieldExpression><![CDATA[$F{zczbhhzbzpzbh}]]></textFieldExpression>
</textField>
<line>
<reportElement x="-11" y="-6" width="581" height="1" uuid="6e02baa0-033f-44bb-8941-57cb7545f696"/>
</line>
<line>
<reportElement x="-11" y="44" width="581" height="1" uuid="cff99d0f-7fe0-48e2-b9f9-4fcb02c13159"/>
</line>
<line>
<reportElement x="-11" y="0" width="1" height="46" uuid="9213557c-69c5-4ba1-a327-c138546f33dc"/>
</line>
<line>
<reportElement x="93" y="0" width="1" height="44" uuid="1a1963b1-c35f-4f27-a1f5-11226928d3da"/>
</line>
<line>
<reportElement x="190" y="-1" width="1" height="44" uuid="54c24c4a-4aa6-4940-848b-d9ab0f8c61ec"/>
</line>
<line>
<reportElement x="335" y="-1" width="1" height="44" uuid="9abb2a20-efde-4df2-938c-a8301b37b01d"/>
</line>
<line>
<reportElement x="271" y="-1" width="1" height="44" uuid="be0176c3-0f40-469d-a822-b49fe0ff66ed"/>
</line>
<line>
<reportElement x="397" y="-1" width="1" height="44" uuid="0c148808-1742-4eef-a4c1-590ef2a268fb"/>
</line>
<line>
<reportElement x="454" y="-1" width="1" height="44" uuid="977a419a-0ed3-494f-90c1-444900a8ab9f"/>
</line>
<line>
<reportElement x="570" y="-2" width="1" height="48" uuid="12270e75-0e37-49af-a53b-f0ccbac542c5"/>
</line>
</band>
</detail>
<columnFooter>
<band splitType="Stretch"/>
</columnFooter>
<pageFooter>
<band splitType="Stretch"/>
</pageFooter>
<summary>
<band height="93" splitType="Stretch">
<textField isBlankWhenNull="true">
<reportElement x="416" y="48" width="100" height="21" uuid="fa0d9aed-728b-4700-8cdc-480eef4623e5"/>
<textElement verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{billBy}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="326" y="47" width="80" height="24" uuid="e6b7d051-d47d-46d9-ba2b-eb4c4139c5d8"/>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font fontName="华文宋体"/>
</textElement>
<text><![CDATA[开单人:]]></text>
</staticText>
<line>
<reportElement x="570" y="0" width="1" height="42" uuid="09545d99-eb15-43e9-88b4-79053c475458"/>
</line>
<line>
<reportElement x="335" y="-1" width="1" height="42" uuid="22a2e639-25ee-4bb2-8264-e7e3277775dc"/>
</line>
<line>
<reportElement x="-11" y="42" width="581" height="1" uuid="c3d0ee9f-b319-4287-b0cd-e28f45f81611"/>
</line>
<line>
<reportElement x="93" y="-1" width="1" height="42" uuid="e366110d-0e7e-4abe-967f-d6424b4346a2"/>
</line>
<line>
<reportElement x="-11" y="1" width="1" height="40" uuid="932c4e75-824b-43a1-8f98-c222869e1e7f"/>
</line>
<textField isBlankWhenNull="true">
<reportElement x="232" y="6" width="100" height="24" uuid="da11bd14-bd7d-4096-bff3-fa5070d75826"/>
<textElement textAlignment="Right" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{total}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="0" y="6" width="80" height="24" uuid="85978bb5-24bc-4b50-bd52-5e2ef0cc9f98"/>
<textElement textAlignment="Center" verticalAlignment="Middle">
<font fontName="华文宋体"/>
</textElement>
<text><![CDATA[合计]]></text>
</staticText>
</band>
</summary>
</jasperReport>

@ -0,0 +1,51 @@
<?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.basic.BasicExportDao">
<select id="filterExportStatus" parameterType="com.glxp.api.admin.req.basic.BasicExportStatusRequest"
resultType="com.glxp.api.admin.entity.basic.BasicExportStatusEntity">
select * from basic_export_status
<where>
<if test="id != '' and id!=null">
and id = #{id}
</if>
<if test="status != '' and status!=null">
and status = #{status}
</if>
<if test="type != '' and type!=null">
and type = #{type}
</if>
</where>
</select>
<insert id="insertExportStatus" keyProperty="id"
parameterType="com.glxp.api.admin.entity.basic.BasicExportStatusEntity">
replace
INTO basic_export_status(idDatas,status,type,updateTime)
values(
#{idDatas},
#{status},
#{type},
#{updateTime}
)
</insert>
<update id="updateExportStatus" parameterType="com.glxp.api.admin.entity.basic.BasicExportStatusEntity">
UPDATE basic_export_status
<trim prefix="set" suffixOverrides=",">
<if test="idDatas != null">idDatas=#{idDatas},</if>
<if test="status != null">status=#{status},</if>
<if test="type != null">type=#{type},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if>
</trim>
WHERE orderId = #{orderId}
</update>
<delete id="deleteById" parameterType="Map">
DELETE
FROM basic_export_status
WHERE id = #{id}
</delete>
</mapper>

@ -34,7 +34,7 @@
</update>
<delete id="deleteByOrderId" parameterType="Map">
DELETE
FROM io_order_detail
FROM io_order_status
WHERE orderId = #{orderId}
</delete>

@ -0,0 +1,62 @@
<?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.thrsys.ThrImportLogDao">
<select id="filterImportLog" parameterType="com.glxp.api.admin.req.basic.FilterUdiIpLogRequest"
resultType="com.glxp.api.admin.entity.thrsys.ThrImportLogEntity">
SELECT * FROM thr_import_log
<where>
<if test="genKey != '' and genKey != null">
AND genKey = #{genKey}
</if>
<if test="id != '' and id != null">
AND id = #{id}
</if>
<if test="status != '' and status != null">
AND status = #{status}
</if>
<if test="thirdSysFk != '' and thirdSysFk != null">
AND thirdSysFk = #{thirdSysFk}
</if>
<if test="importType != '' and importType != null">
AND importType = #{importType}
</if>
</where>
ORDER BY updateTime DESC
</select>
<insert id="insertImportLog" keyProperty="id"
parameterType="com.glxp.api.admin.entity.thrsys.ThrImportLogEntity">
insert INTO thr_import_log
(genKey, fromType, updateTime, thirdSysFk, status,importType)
values (#{genKey},
#{fromType},
#{updateTime},
#{thirdSysFk}, #{status},#{importType})
</insert>
<delete id="deleteById" parameterType="Map">
DELETE
FROM thr_import_log
WHERE id = #{id}
</delete>
<update id="updateImportLog" parameterType="com.glxp.api.admin.entity.thrsys.ThrImportLogEntity">
UPDATE thr_import_log
<set>
<if test="genKey != null">genKey=#{genKey},</if>
<if test="fromType != null">fromType=#{fromType},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if>
<if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
<if test="status != null">status=#{status},</if>
<if test="remark != null">remark=#{remark},</if>
<if test="importType != null">importType=#{importType},</if>
</set>
WHERE genKey = #{genKey}
</update>
</mapper>
Loading…
Cancel
Save