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

Merge branch 'dev' into test

Browse Source
dev
郑明梁 2 years ago
parent c5396f0c18 5a377fe206
commit e2e9e080ee
77 changed files with 635 additions and 809 deletions
Show Stats Download Patch File Download Diff File

1
src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
Unescape Escape View File

@ -114,7 +114,6 @@ public class InvWarehouseController extends BaseController {
@AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filterGroupBySpuse")
public BaseResponse filterGroupBySpuse(FilterInvWarehouseRequest filterInvWarehouseRequest) {
filterInvWarehouseRequest.setUserId(getUserId());
List<InvWarehouseEntity> invSubWarehouseEntities = invWarehouseService.filterGroupBySpuse(filterInvWarehouseRequest);
return ResultVOUtils.success(invSubWarehouseEntities);
}

5
src/main/java/com/glxp/api/controller/auth/LoginController.java
Unescape Escape View File

@ -24,7 +24,6 @@ import com.glxp.api.service.auth.*;
import com.glxp.api.util.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
@ -113,7 +112,7 @@ public class LoginController extends BaseController {
Map<String, Object> map = new HashMap<>();
map.put("id", authAdmin.getId());
map.put("token", token);
map.put("time", DateUtil.getDateTime());
map.put("time", MsDateUtil.getDateTime());
LoginResponse loginResponse = new LoginResponse();
loginResponse.setId(authAdmin.getId() + "");
loginResponse.setToken(token);
@ -185,7 +184,7 @@ public class LoginController extends BaseController {
Map<String, Object> map = new HashMap<>();
map.put("id", authAdmin.getId());
map.put("token", token);
map.put("time", DateUtil.getDateTime());
map.put("time", MsDateUtil.getDateTime());
return ResultVOUtils.success(map);
}

3
src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java
Unescape Escape View File

@ -173,6 +173,9 @@ public class BasicBusTypePreController {
if (result) {
return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "原单据类型已存在，不允许重复添加！");
}
if(basicBusTypePreEntity.getAction().equals(basicBusTypePreEntity.getOriginAction())){
return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "出入库单与目标出入库单相同！");
}
basicBusTypePreService.updateBusChangeType(basicBusTypePreEntity);
} else {

14
src/main/java/com/glxp/api/controller/basic/BasicCorpController.java
Unescape Escape View File

@ -78,7 +78,15 @@ public class BasicCorpController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<BasicCorpEntity> basicUnitMaintainEntities;
basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK);
//是供应商的时候拉客户和供应商
if (basicUnitMaintainFilterRequest.getCorpType() == null) {
basicUnitMaintainFilterRequest.setCorpType(2);
} else if (basicUnitMaintainFilterRequest.getCorpType() == 2) {
basicUnitMaintainFilterRequest.setCorpType(null);
basicUnitMaintainFilterRequest.setCorpTypeList(new ArrayList<>(Arrays.asList(1, 2)));
} else {
basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK);
}
basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
PageInfo<BasicCorpEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
PageSimpleResponse<BasicCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();
@ -252,12 +260,10 @@ public class BasicCorpController {
return ResultVOUtils.error(500, "往来单位接口地址未定义");
if (basicThirdSysDetailEntity.getEnabled()) {
thrUnitImportService.selectAllUnit(basicThirdSysDetailEntity, unitMaintainFilterRequest);
} else {
return ResultVOUtils.error(500, "第三方系统往来单位接口服务未启用");
}
return ResultVOUtils.success("后台正在添加，请稍后刷新查看！");
}
@ -516,7 +522,7 @@ public class BasicCorpController {
@AuthRuleAnnotation("")
@PostMapping("/udiwms/basic/unit/maintain/selectCorpList")
public BaseResponse selectCorpList(@RequestBody BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest) {
public BaseResponse selectCorpList(@RequestBody BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest) {
List<BasicCorpEntity> getCorpList = basicUnitMaintainService.selectCorpList(basicUnitMaintainFilterRequest);
return ResultVOUtils.success(getCorpList);

15
src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java
Unescape Escape View File

@ -137,6 +137,16 @@ public class BasicProductCategoryController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
//先判断是否有下级 无下级在判断是否有产品
boolean b = basicProductCategoryService.checkExist(basicProductTypeRequest.getCode());
if(b){
return ResultVOUtils.error(555,"此分类下还有子分类,不能删除!");
}
//判断此分类中是否有产品
boolean checkrel = basicProductCategoryService.checkrel(basicProductTypeRequest.getCode());
if(checkrel){
return ResultVOUtils.error(555,"此分类中绑定产品,不能删除!");
}
String msg = basicProductCategoryService.delectBasicHospType(basicProductTypeRequest);
@ -272,8 +282,6 @@ public class BasicProductCategoryController {
@GetMapping("/udiwms/basic/product/category/SelcetproductList")
public BaseResponse SelectproductList(FilterUdiRelRequest filterUdiRelRequest) {
List<UdiRelevanceResponse> udiRelevanceResponses=null;
@ -325,6 +333,9 @@ public class BasicProductCategoryController {
for (UdiRelevanceResponse udiRelevanceRespons : udiRelevanceResponses) {
list.add(udiRelevanceRespons.getId()+"");
}
if(!(udiRelevanceResponses != null && udiRelevanceResponses.size()>0)){
return ResultVOUtils.error(456,"为查询到对应数据!");
}
basicProductTypeRequest.setIds(list);
basicProductCategoryService.insertCateRel(basicProductTypeRequest);

17
src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
Unescape Escape View File

@ -1,8 +1,6 @@
package com.glxp.api.controller.inout;
import cn.hutool.Hutool;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.UUID;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
@ -25,10 +23,6 @@ import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.basic.UdiProductEntity;
import com.glxp.api.entity.inout.*;
import com.glxp.api.entity.inv.InvPreInProductDetailEntity;
import com.glxp.api.entity.inv.InvPreProductDetailEntity;
import com.glxp.api.entity.inv.InvPreinDetailEntity;
import com.glxp.api.entity.inv.InvProductDetailEntity;
import com.glxp.api.entity.system.SystemParamConfigEntity;
import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
import com.glxp.api.req.inout.AddEnterCodeRequest;
import com.glxp.api.req.inout.AddOrderRequest;
@ -44,7 +38,6 @@ import com.glxp.api.service.auth.InvWarehouseService;
import com.glxp.api.service.basic.*;
import com.glxp.api.service.inout.*;
import com.glxp.api.service.inv.*;
import com.glxp.api.service.purchase.SupProductService;
import com.glxp.api.service.system.SystemParamConfigService;
import com.glxp.api.util.*;
import com.glxp.api.util.udi.FilterUdiUtils;
@ -382,7 +375,7 @@ public class IoCodeTempController extends BaseController {
if (udiInfoEntity == null) {
return ResultVOUtils.error(500, "耗材字典不存在此产品！");
}
if (!udiInfoEntity.getAllowNoBatch()) {
if (!IntUtil.value(udiInfoEntity.getAllowNoBatch())) {
if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
return ResultVOUtils.error(500, "序列号与批次号不能同时为空！");
}
@ -429,7 +422,7 @@ public class IoCodeTempController extends BaseController {
if (bussinessTypeEntity.getCheckVailDate() == 1 && !addOrderRequest.isIgnoreExpire()) {
if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
String expireDate = "20" + udiEntity.getExpireDate();
long expireTime = DateUtil.parseDateExpire(expireDate);
long expireTime = MsDateUtil.parseDateExpire(expireDate);
if (expireTime - System.currentTimeMillis() < 0) {
return ResultVOUtils.error(504, "当前产品已过期,是否确定继续添加?");
}
@ -438,7 +431,7 @@ public class IoCodeTempController extends BaseController {
if (bussinessTypeEntity.getCheckExpire() == 2) {
if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
String expireDate = "20" + udiEntity.getExpireDate();
long expireTime = DateUtil.parseDateExpire(expireDate);
long expireTime = MsDateUtil.parseDateExpire(expireDate);
if (expireTime - System.currentTimeMillis() < 0) {
return ResultVOUtils.error(604, "当前产品已过期,无法添加?");
}
@ -455,7 +448,7 @@ public class IoCodeTempController extends BaseController {
if (bussinessTypeEntity.getCheckVailDate() == 1 && recent > 0 && !addOrderRequest.isIgnoreRecentExpire()) {
if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
String expireDate = "20" + udiEntity.getExpireDate();
long expireTime = DateUtil.parseDateExpire(expireDate);
long expireTime = MsDateUtil.parseDateExpire(expireDate);
long recentTieme = Math.abs(recent * 24 * 60 * 60 * 1000);
long resultTime = expireTime - System.currentTimeMillis();
@ -471,7 +464,7 @@ public class IoCodeTempController extends BaseController {
if (bussinessTypeEntity.getCheckVailDate() == 2 && recent > 0) {
if (StrUtil.isNotEmpty(udiEntity.getExpireDate())) {
String expireDate = "20" + udiEntity.getExpireDate();
long expireTime = DateUtil.parseDateExpire(expireDate);
long expireTime = MsDateUtil.parseDateExpire(expireDate);
long recentTieme = Math.abs(recent * 24 * 60 * 60 * 1000);
long resultTime = expireTime - System.currentTimeMillis();

14
src/main/java/com/glxp/api/controller/inout/IoOrderController.java
Unescape Escape View File

@ -247,7 +247,7 @@ public class IoOrderController extends BaseController {
return tempResponse;
//todo 目前先去掉因为不能改变状态 有问题可以看一下这个方法
// if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_TEMP_SAVE){
ioAddInoutService.dealProcess(orderEntity);
ioAddInoutService.dealProcess(orderEntity);
// }
@ -359,7 +359,7 @@ public class IoOrderController extends BaseController {
public BaseResponse checkSubmitEnable(IoOrderEntity orderEntity) {
if(orderEntity==null){
if (orderEntity == null) {
return ResultVOUtils.error(500, "提交失败，请先添加物资！");
}
@ -735,7 +735,7 @@ public class IoOrderController extends BaseController {
@PostMapping("/udiwms/stock/order/change")
public BaseResponse stockOrderChange(@RequestBody AddOrderChangeRequest addOrderChangeRequest) {
AuthAdmin authAdmin = getUser();
IoOrderEntity originOrder = orderService.findByBillNo(addOrderChangeRequest.getOrderId());
IoOrderEntity newOrder = new IoOrderEntity();
List<IoCodeEntity> originCodes = codeService.findByOrderId(originOrder.getBillNo());
@ -748,7 +748,8 @@ public class IoOrderController extends BaseController {
newOrder.setFromDeptCode(fromInv.getParentId());
}
newOrder.setCreateUser(authAdmin.getId() + "");
newOrder.setUpdateUser(authAdmin.getId() + "");
InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addOrderChangeRequest.getInvCode());
newOrder.setInvCode(addOrderChangeRequest.getInvCode());
newOrder.setDeptCode(invWarehouseEntity.getParentId());
@ -829,8 +830,8 @@ public class IoOrderController extends BaseController {
return ResultVOUtils.success();
}
@GetMapping ("/udiwms/inout/order/getUserBean")
public BaseResponse getUserBean(){
@GetMapping("/udiwms/inout/order/getUserBean")
public BaseResponse getUserBean() {
AuthAdmin userBean = customerService.getUserBean();
@ -838,5 +839,4 @@ public class IoOrderController extends BaseController {
}
}

26
src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
Unescape Escape View File

@ -49,6 +49,7 @@ import com.glxp.api.service.thrsys.ThrOrderDetailService;
import com.glxp.api.service.thrsys.ThrOrderService;
import com.glxp.api.service.thrsys.ThrSystemBusApiService;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.MsDateUtil;
import com.glxp.api.util.OrderNoTypeBean;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
@ -271,15 +272,15 @@ public class IoOrderDetailBizController extends BaseController {
//获取往来信息
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INNOR) {//内部调拨
InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByThrCode(thrOrderEntity.getCorpId(), thrOrderEntity.getThirdSysFk());
orderEntity.setFromDeptCode(invWarehouseEntity.getParentId());
orderEntity.setFromInvCode(invWarehouseEntity.getCode());
} else if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { //往来信息
} else { //往来信息
BasicCorpEntity basicCorpEntity = basicCorpService.selectByThirdId(thrOrderEntity.getCorpId(), thrOrderEntity.getThirdSysFk());
if (basicCorpEntity == null) {
return ResultVOUtils.error(500, "往来单位信息未关联！");
}
orderEntity.setFromCorp(basicCorpEntity.getErpId());
} else {
orderEntity.setFromCorp(thrOrderEntity.getCorpId());
}
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
@ -306,7 +307,9 @@ public class IoOrderDetailBizController extends BaseController {
ioOrderDetailBizEntity.setManufacturer(udiRelevanceResponse.getManufactory());
ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname());
ioOrderDetailBizEntity.setSpec(udiRelevanceResponse.getGgxh());
ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(Double.valueOf(udiRelevanceResponse.getPrice())));
if (udiRelevanceResponse.getPrice() != null) {
ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(Double.valueOf(udiRelevanceResponse.getPrice())));
}
ioOrderDetailBizEntity.setSupId(udiRelevanceResponse.getCustomerId() + "");
} else {
ioOrderDetailBizEntity.setCoName(thrOrderDetailEntity.getCorpName());
@ -315,7 +318,6 @@ public class IoOrderDetailBizController extends BaseController {
ioOrderDetailBizEntity.setManufacturer(thrOrderDetailEntity.getManufactory());
ioOrderDetailBizEntity.setSpec(thrOrderDetailEntity.getSpec());
ioOrderDetailBizEntity.setPrice(thrOrderDetailEntity.getPrice());
if (udiRelevanceEntities.size() > 1) {
String bindRlIds = "";
for (UdiRlSupResponse temp : udiRelevanceEntities) {
@ -326,11 +328,15 @@ public class IoOrderDetailBizController extends BaseController {
}
ioOrderDetailBizEntity.setOrderIdFk(orderEntity.getBillNo());
ioOrderDetailBizEntity.setProductDate(thrOrderDetailEntity.getProductDate());
ioOrderDetailBizEntity.setExpireDate(thrOrderDetailEntity.getExpireDate());
if (StrUtil.isNotEmpty(thrOrderDetailEntity.getProductDate())) {
ioOrderDetailBizEntity.setProductDate(MsDateUtil.getDiFormat(thrOrderDetailEntity.getProductDate()));
}
if (StrUtil.isNotEmpty(thrOrderDetailEntity.getExpireDate())) {
ioOrderDetailBizEntity.setExpireDate(MsDateUtil.getDiFormat(thrOrderDetailEntity.getExpireDate()));
}
ioOrderDetailBizEntity.setBatchNo(thrOrderDetailEntity.getBatchNo());
ioOrderDetailBizEntity.setCount(thrOrderDetailEntity.getCount());
if (StrUtil.isNotEmpty(thrOrderDetailEntity.getSupId())) {
BasicCorpEntity basicCorpEntity = basicCorpService.selectByThirdId(thrOrderDetailEntity.getSupId(), thrOrderEntity.getThirdSysFk());
ioOrderDetailBizEntity.setSupId(basicCorpEntity.getErpId());
@ -586,7 +592,7 @@ public class IoOrderDetailBizController extends BaseController {
List<IoOrderInvoiceResponse> ioOrderInvoiceResponses = orderDetailBizService.filterListInv(filterOrderDetailBizRequest1);
if (list.size() == 0) {
ioOrderDetailBizEntity.setRegStatus(false);
}else{
} else {
ioOrderDetailBizEntity.setRegStatus(true);
}
orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity);

6
src/main/java/com/glxp/api/controller/inout/PlatformController.java
Unescape Escape View File

@ -11,6 +11,7 @@ import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.dao.inout.UnitMaintainPlatformDao;
import com.glxp.api.entity.inout.UnitMaintainPlatformEntity;
import com.glxp.api.entity.system.PlatformEntity;
import com.glxp.api.req.inout.PlatformLinkRequest;
@ -41,11 +42,13 @@ public class PlatformController {
private PlatformService platformService;
@Resource
private CustomerService customerService;
@Resource
private UnitMaintainPlatformDao unitMaintainPlatformDao;
@AuthRuleAnnotation("")
@PostMapping("/udiwms/platform/remove")
public BaseResponse remove(@RequestBody PlatformEntity platformEntity) {
if (platformService.remove(platformEntity.getId()) > 0) {
if (unitMaintainPlatformDao.deleteById(platformEntity.getId())) {
ResultVOUtils.success("删除成功");
}
return ResultVOUtils.error(500, "删除失败");
@ -119,6 +122,7 @@ public class PlatformController {
public BaseResponse update(@RequestBody PlatformLinkRequest platformLinkRequest) {
//判断此数据是否重复
String verifyResult = platformService.verifyUnitMaintainPlatform(platformLinkRequest);
if (!verifyResult.equals("success")) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, verifyResult);
}

1
src/main/java/com/glxp/api/controller/inv/InvProductController.java
Unescape Escape View File

@ -24,7 +24,6 @@ import com.glxp.api.service.auth.CustomerService;
import com.glxp.api.service.auth.WarehouseUserService;
import com.glxp.api.service.inv.InvProductDetailService;
import com.glxp.api.service.inv.InvProductService;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.udi.FilterUdiUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.BindingResult;

6
src/main/java/com/glxp/api/controller/inv/UdiTraceController.java
Unescape Escape View File

@ -9,7 +9,6 @@ import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.basic.UdiProductEntity;
import com.glxp.api.entity.inv.InvProductDetailEntity;
import com.glxp.api.req.basic.FilterUdiInfoRequest;
import com.glxp.api.req.basic.FilterUdiRelRequest;
import com.glxp.api.req.inout.FilterOrderRequest;
import com.glxp.api.req.inv.FilterCodeTraceRequest;
@ -22,9 +21,8 @@ import com.glxp.api.service.basic.UdiProductService;
import com.glxp.api.service.basic.UdiRelevanceService;
import com.glxp.api.service.inout.IoOrderService;
import com.glxp.api.service.inv.InvProductDetailService;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.MsDateUtil;
import com.glxp.api.util.udi.FilterUdiUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
@ -105,7 +103,7 @@ public class UdiTraceController {
udiTraceResponse.setOrderId(item.getBillNo());
udiTraceResponse.setBillTypeName(item.getBillTypeName());
udiTraceResponse.setFromCorp(item.getFromName());
udiTraceResponse.setActDate(DateUtil.formatDate(item.getCreateTime()));
udiTraceResponse.setActDate(MsDateUtil.formatDate(item.getCreateTime()));
if (finalUdiRelevance != null) {
udiTraceResponse.setYlqxzcrbarmc(finalUdiRelevance.getYlqxzcrbarmc());
udiTraceResponse.setCpmctymc(finalUdiRelevance.getCpmctymc());

32
src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java
Unescape Escape View File

@ -1,27 +1,24 @@
package com.glxp.api.controller.purchase;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.constant.Constant;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.constant.ConstantType;
import com.glxp.api.entity.basic.BasicBusTypeChangeEntity;
import com.glxp.api.entity.basic.BasicProductsEntity;
import com.glxp.api.entity.basic.UdiProductEntity;
import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.inout.PurReceiveDetailEntity;
import com.glxp.api.entity.inout.PurReceiveEntity;
import com.glxp.api.entity.purchase.*;
import com.glxp.api.service.basic.IBasicBusTypeChangeService;
import com.glxp.api.service.basic.UdiProductService;
import com.glxp.api.service.inout.IoOrderDetailBizService;
import com.glxp.api.service.inout.IoOrderService;
import com.glxp.api.service.inout.ReceiveService;
import com.glxp.api.service.inout.ReceivedetailService;
import com.glxp.api.service.purchase.*;
import com.glxp.api.util.CustomUtil;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.MsDateUtil;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.OrderNoTypeBean;
import org.springframework.stereotype.Service;
@ -125,7 +122,7 @@ public class IoPurChangeService {
PurPlanEntity purPlanEntity = new PurPlanEntity();
List<PurPlanDetailEntity> purPlanDetailEntityList = new ArrayList<>();
if (purApplyEntity.getStatus() == 3) {
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CPSG");
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CPSG);
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purPlanEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.JH_ORDER, "yyyyMMdd")));
purPlanEntity.setBillDate(purApplyEntity.getBillDate());
@ -134,13 +131,17 @@ public class IoPurChangeService {
purPlanEntity.setEmergency(purApplyEntity.getEmergency());
purPlanEntity.setArrivalTime(purApplyEntity.getArrivalTime());
purPlanEntity.setInvCode(purApplyEntity.getTargetInvCode());
purPlanEntity.setBillType(ConstantStatus.BUS_ORDER_CGJH);
purPlanEntity.setDeptCode(purApplyEntity.getTargetDeptCode());
purPlanEntity.setCreateUser(purApplyEntity.getAuditUser());
purPlanEntity.setApplyCreateUser(purApplyEntity.getCreateUser());
purPlanEntity.setApplyAuditUser(purApplyEntity.getAuditUser());
purPlanEntity.setApplyInv(purApplyEntity.getInvCode());
purPlanEntity.setApplyBillNo(purApplyEntity.getBillNo());
purPlanEntity.setApplyRemark(purApplyEntity.getRemark());
if (basicBusTypeChangeEntity.getBusBeforeTime() != null) {
purPlanEntity.setCreateTime(DateUtil.timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
purPlanEntity.setUpdateTime(DateUtil.timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
purPlanEntity.setCreateTime(MsDateUtil.timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
purPlanEntity.setUpdateTime(MsDateUtil.timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
} else {
purPlanEntity.setCreateTime(purApplyEntity.getCreateTime());
purPlanEntity.setUpdateUser(purApplyEntity.getAuditUser());
@ -202,7 +203,7 @@ public class IoPurChangeService {
//根据供应商分组
Map<String, List<PurPlanDetailEntity>> purPlanDetailMap = purPlanDetailEntityList1.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId));
purPlanDetailMap.put("not", purPlanDetailEntityList2);
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH");
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGJH);
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
for (String key : purPlanDetailMap.keySet()) {
PurOrderEntity purOrderEntity = new PurOrderEntity();
@ -223,11 +224,14 @@ public class IoPurChangeService {
purOrderEntity.setDeptCode(purPlanEntity.getDeptCode());
purOrderEntity.setApplyRemark(purPlanEntity.getApplyRemark());
purOrderEntity.setApplyCreateUser(purPlanEntity.getApplyCreateUser());
purOrderEntity.setApplyAuditUser(purPlanEntity.getApplyAuditUser());
purOrderEntity.setApplyInv(purPlanEntity.getApplyInv());
purOrderEntity.setCreateUser(purPlanEntity.getAuditUser());
purOrderEntity.setUpdateUser(purPlanEntity.getAuditUser());
purOrderEntity.setBillType(ConstantStatus.BUS_ORDER_CGDD);
if (basicBusTypeChangeEntity.getBusBeforeTime() != null) {
purOrderEntity.setCreateTime(DateUtil.timeProcess(new Date(), basicBusTypeChangeEntity.getBusBeforeTime()));
purOrderEntity.setUpdateTime(DateUtil.timeProcess(new Date(), basicBusTypeChangeEntity.getBusBeforeTime()));
purOrderEntity.setCreateTime(MsDateUtil.timeProcess(new Date(), basicBusTypeChangeEntity.getBusBeforeTime()));
purOrderEntity.setUpdateTime(MsDateUtil.timeProcess(new Date(), basicBusTypeChangeEntity.getBusBeforeTime()));
} else {
purOrderEntity.setCreateTime(new Date());
purOrderEntity.setUpdateTime(new Date());
@ -255,13 +259,9 @@ public class IoPurChangeService {
// 更新计划表信息插入订单单号
PurPlanEntity purPlanEntity1 = new PurPlanEntity();
purPlanEntity1.setId(purPlanEntity.getId());
purPlanEntity1.setStockOrderNo(billNos.substring(0));
// purPlanEntity.sets(true);
purPlanEntity1.setStockOrderNo(billNos);
purPlanService.update(purPlanEntity1);
}
// if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
// purPlanGen(purPlanEntity);
// }
}
}
@ -422,7 +422,7 @@ public class IoPurChangeService {
//采购计划生成扫码单据
public void purPlanGen(PurPlanEntity purPlanEntity) {
BasicBusTypeChangeEntity basicBusTypeChangeEntity = new BasicBusTypeChangeEntity();
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH");
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGJH);
List<PurPlanDetailEntity> purPlanDetailEntities = purPlanDetailService.findByOrderId(purPlanEntity.getId() + "");
//对计划单里面的供应商进行分组
Map<String, List<PurPlanDetailEntity>> map = purPlanDetailEntities.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId));

16
src/main/java/com/glxp/api/controller/purchase/PurApplyController.java
Unescape Escape View File

@ -90,6 +90,7 @@ public class PurApplyController {
purApplyEntity.setCreateUser(userId + "");
purApplyEntity.setCreateTime(new Date());
purApplyEntity.setUpdateTime(new Date());
purApplyEntity.setBillType(ConstantStatus.BUS_ORDER_CPSG);
purApplyEntity.setStatus(postPurApplyRequest.getEditStatus()); //草稿状态
if (postPurApplyRequest.getType() != null) {
String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd"));
@ -109,7 +110,7 @@ public class PurApplyController {
* 查询申购单列表
*/
@PostMapping("/purchase/apply/list")
public BaseResponse list(@RequestBody PurApplyRequest purApplyRequest) {
public BaseResponse list(@RequestBody PurApplyRequest purApplyRequest) {
if (purApplyRequest.getStatus() == null) {
purApplyRequest.setStatus(11); //查询未审核和草稿状态
@ -130,12 +131,11 @@ public class PurApplyController {
* 查询申购单列表
*/
@PostMapping("/purchase/apply/auditList")
public BaseResponse auditList(@RequestBody PurApplyRequest purApplyRequest) {
public BaseResponse auditList(@RequestBody PurApplyRequest purApplyRequest) {
if (purApplyRequest.getStatus() == null) {
purApplyRequest.setStatus(10); //查询未审核和已审核状态
}
List<PurApplyResponse> purApplyEntities = purApplyService.queryPageList(purApplyRequest);
PageInfo<PurApplyResponse> pageInfo;
pageInfo = new PageInfo<>(purApplyEntities);
@ -214,7 +214,7 @@ public class PurApplyController {
PurPlanEntity purPlanEntity = new PurPlanEntity();
List<PurPlanDetailEntity> purPlanDetailEntityList = new ArrayList<>();
if (purApplyEntity.getStatus() == 3) {
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CPSG");
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CPSG);
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purPlanEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.JH_ORDER, "yyyyMMdd")));
purPlanEntity.setBillDate(purApplyEntity.getBillDate());
@ -255,7 +255,7 @@ public class PurApplyController {
//---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\
PurOrderEntity purOrderEntity = new PurOrderEntity();
if (purPlanEntity.getStatus() == 3) {
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH");
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGJH);
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd")));
purOrderEntity.setBillDate(purApplyEntity.getBillDate());
@ -477,15 +477,15 @@ public class PurApplyController {
*/
@RepeatSubmit()
@PostMapping("/purchase/apply/addDetail")
public BaseResponse addDetail(@RequestBody List<PurApplyDetailEntity> list) {
public BaseResponse addDetail(@RequestBody List<PurApplyDetailEntity> list) {
if(list.size()!=0) {
if (list.size() != 0) {
for (PurApplyDetailEntity purApplyDetailEntity : list) {
purApplyDetailService.insert(purApplyDetailEntity);
}
return ResultVOUtils.success(list.get(0).getOrderIdFk());
}
return ResultVOUtils.error(555,"请选择数据!");
return ResultVOUtils.error(555, "请选择数据!");
}
/**

5
src/main/java/com/glxp/api/controller/purchase/PurOrderController.java
Unescape Escape View File

@ -9,6 +9,7 @@ import com.glxp.api.annotation.RepeatSubmit;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.Constant;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.entity.inv.InvProductDetailEntity;
import com.glxp.api.entity.purchase.*;
@ -80,13 +81,13 @@ public class PurOrderController {
Long userId = customerService.getUserId();
PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity();
Long id=purOrderEntity.getId();
Long id = purOrderEntity.getId();
purOrderEntity.setCreateUser(userId + "");
purOrderEntity.setCreateTime(new Date());
purOrderEntity.setUpdateTime(new Date());
purOrderEntity.setUpdateUser(userId + "");
purOrderEntity.setStatus(postPurOrderRequest.getEditStatus()); //草稿状态
purOrderEntity.setBillType(ConstantStatus.BUS_ORDER_CGDD);
if (postPurOrderRequest.getType() != null) {
String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd"));
purOrderEntity.setBillNo(billNo);

4
src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java
Unescape Escape View File

@ -309,7 +309,7 @@ public class PurOrderReceiveController extends BaseController {
PurPlanEntity purPlanEntity = new PurPlanEntity();
List<PurPlanDetailEntity> purPlanDetailEntityList = new ArrayList<>();
if (purApplyEntity.getStatus() == 3) {
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CPSG");
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CPSG);
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purPlanEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.JH_ORDER, "yyyyMMdd")));
purPlanEntity.setBillDate(purReceiveEntity.getBillDate());
@ -349,7 +349,7 @@ public class PurOrderReceiveController extends BaseController {
//---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\
PurOrderEntity purOrderEntity = new PurOrderEntity();
if (purPlanEntity.getStatus() == 3) {
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH");
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGJH);
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd")));
purOrderEntity.setBillDate(purReceiveEntity.getBillDate());

5
src/main/java/com/glxp/api/controller/purchase/PurPlanController.java
Unescape Escape View File

@ -94,7 +94,7 @@ public class PurPlanController {
purPlanEntity.setUpdateTime(new Date());
purPlanEntity.setUpdateUser(userId + "");
purPlanEntity.setStatus(postPurPlanRequest.getEditStatus()); //草稿状态
purPlanEntity.setBillType(ConstantStatus.BUS_ORDER_CGJH);
if (postPurPlanRequest.getType() != null) {
String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd"));
purPlanEntity.setBillNo(billNo);
@ -187,6 +187,7 @@ public class PurPlanController {
purPlanEntity.setStatus(postPurPlanRequest.getEditStatus());
purPlanService.update(purPlanEntity);
if (purPlanEntity.getStatus() == 3) {
purPlanEntity = purPlanService.selectById(purPlanEntity.getId());
purChangeService.purPlanChange(purPlanEntity);
// generateDocument(purPlanEntity);
}
@ -261,7 +262,7 @@ public class PurPlanController {
//---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\
PurOrderEntity purOrderEntity = new PurOrderEntity();
if (purPlanEntity.getStatus() == 3) {
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH");
basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGJH);
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd")));
purOrderEntity.setBillDate(purPlanEntity.getBillDate());

6
src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java
Unescape Escape View File

@ -22,7 +22,7 @@ import com.glxp.api.service.sync.BasicDownloadService;
import com.glxp.api.service.sync.BasicExportService;
import com.glxp.api.service.sync.BasicExportTimeService;
import com.glxp.api.service.sync.HeartService;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.MsDateUtil;
import com.glxp.api.util.RedisUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@ -219,8 +219,8 @@ public class SpsSyncExportStatusController {
CompletableFuture future = CompletableFuture.runAsync(() -> {
switch (req.getExportType()) {
case IO_ORDER:
heartService.uploadAllBusOrder(DateUtil.formatDateTime(req.getSyncTime()));
heartService.uploadAllOrder(DateUtil.formatDateTime(req.getSyncTime()));
heartService.uploadAllBusOrder(MsDateUtil.formatDateTime(req.getSyncTime()));
heartService.uploadAllOrder(MsDateUtil.formatDateTime(req.getSyncTime()));
break;
default:
heartService.pushData(syncDataSetEntity, req.getSyncTime(), req.getExportType());

6
src/main/java/com/glxp/api/controller/system/DeviceKeyController.java
Unescape Escape View File

@ -6,7 +6,7 @@ import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.req.system.FilterDeviceKeyRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.service.auth.SysPdaKeyService;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.MsDateUtil;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
@ -53,7 +53,7 @@ public class DeviceKeyController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
sysPdaKeyEntity.setDate(DateUtil.getDate());
sysPdaKeyEntity.setDate(MsDateUtil.getDate());
sysPdaKeyService.updateDeviceKey(sysPdaKeyEntity);
return ResultVOUtils.success("审核成功");
@ -91,7 +91,7 @@ public class DeviceKeyController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
sysPdaKeyEntity.setDate(DateUtil.getDateTime());
sysPdaKeyEntity.setDate(MsDateUtil.getDateTime());
sysPdaKeyEntity.setIsCheck(0);
sysPdaKeyService.insertDeviceKey(sysPdaKeyEntity);
return ResultVOUtils.success("1");

25
src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java
Unescape Escape View File

@ -11,6 +11,7 @@ import com.glxp.api.constant.BasicProcessStatus;
import com.glxp.api.constant.Constant;
import com.glxp.api.entity.system.SystemParamConfigEntity;
import com.glxp.api.entity.thrsys.*;
import com.glxp.api.http.ErpOrderClient;
import com.glxp.api.http.HttpOkClient;
import com.glxp.api.req.inout.FilterOrderRequest;
import com.glxp.api.req.system.DeleteRequest;
@ -48,7 +49,8 @@ public class ThrOrderController {
private SystemParamConfigService systemParamConfigService;
@Resource
private IThrBusTypeOriginService iThrBusTypeOriginService;
@Resource
ErpOrderClient erpOrderClient;
@Resource
HttpOkClient httpOkClient;
@ -282,14 +284,13 @@ public class ThrOrderController {
@PostMapping("/udiwms/thrsys/orders/orderDownload")
public BaseResponse orderDownload(@RequestBody FilterThrOrderRequest filterThrProductsRequest) {
String data = (String) redisUtil.get(Constant.dlThrOrders);
if (false) {//(data != null && data.equals("true")) {
if ((data != null && data.equals("true"))) {
return ResultVOUtils.error(500, "当前任务正在下载更新业务单据信息，请稍后重试！");
} else {
redisUtil.set(Constant.dlThrOrders, "true", 10 * 30);
// if (filterThrProductsRequest.getBillAction() == null) {
// return ResultVOUtils.error(500, "未选择业务类型！");
// }
redisUtil.set(Constant.dlThrOrders, "true", 1 * 60);
if (filterThrProductsRequest.getBillAction() == null) {
return ResultVOUtils.error(500, "未选择业务类型！");
}
ThrOrderImportLogEntity thrOrderImportLogEntity = new ThrOrderImportLogEntity();
String genKey = CustomUtil.getId();
thrOrderImportLogEntity.setGenKey(genKey);
@ -363,11 +364,11 @@ public class ThrOrderController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
//
// if (filterErpOrderRequest.getIsDownThrSys()) {
// BaseResponse<PageSimpleResponse<ErpOrderResponse>> responseBaseResponse = erpOrderClient.getErpOrderResponse(filterErpOrderRequest);
// return responseBaseResponse;
// }
if (filterErpOrderRequest.getIsDownThrSys()) {
BaseResponse<PageSimpleResponse<ThrOrderResponse>> responseBaseResponse = erpOrderClient.getThrOrderResponse(filterErpOrderRequest);
return responseBaseResponse;
}
ThrSystemDetailEntity thrSystemDetailEntity = iThrBusTypeOriginService.findSysByAction(filterErpOrderRequest.getBillAction(), "orderQueryUrl");

2
src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java
Unescape Escape View File

@ -16,7 +16,7 @@ public interface BasicCorpDao extends BaseMapperPlus<BasicCorpDao, BasicCorpEnti
boolean insertBasicUnitMaintain(BasicCorpEntity basicUnitMaintainEntity);
boolean insertThrUnitMaintainignore(ThrUnitMaintainResponse thrUnitMaintainResponse);
boolean insertThrUnitMaintainignore(BasicCorpEntity thrUnitMaintainResponse);
int customUpdateById(BasicCorpEntity basicUnitMaintainSaveRequest);

4
src/main/java/com/glxp/api/dao/inout/UnitMaintainPlatformDao.java
Unescape Escape View File

@ -38,11 +38,11 @@ public interface UnitMaintainPlatformDao {
UnitMaintainPlatformEntity findLinkData(@Param("customerId") long customerId, @Param("action") String action, @Param("unitId") String unitId);
void deleteById(String id);
boolean deleteById(String id);
Long selectCount(@Param("unitId") String unitId, @Param("action") String action);
List<PlatformLinkResponse> selectDelectList(@Param("platformId") String platformId);
PlatformLinkResponse selectByUnitld(@Param("unitld") String unitld);
PlatformLinkResponse selectByUnitld(@Param("unitld") String unitld,@Param("sourceAction") String sourceAction);
}

10
src/main/java/com/glxp/api/dao/purchase/PurPlanDao.java
Unescape Escape View File

@ -1,6 +1,8 @@
package com.glxp.api.dao.purchase;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.purchase.PurOrderEntity;
import com.glxp.api.entity.purchase.PurPlanEntity;
import com.glxp.api.req.purchase.PurPlanRequest;
import com.glxp.api.res.purchase.PurPlanResponse;
@ -10,16 +12,10 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface PurPlanDao {
public interface PurPlanDao extends BaseMapperPlus<PurPlanDao, PurPlanEntity, PurPlanEntity> {
List<PurPlanResponse> queryPageList(PurPlanRequest purPlanRequest);
Boolean insert(PurPlanEntity purPlanRequest);
Boolean update(PurPlanEntity purPlanRequest);
Boolean deleteByIds(@Param("ids") List<Integer> ids);
Boolean deleteById(@Param("id") long id);
}

29
src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
Unescape Escape View File

@ -3,6 +3,8 @@ package com.glxp.api.entity.basic;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.util.Date;
/**
* 耗材字典信息表
*/
@ -92,31 +94,6 @@ public class UdiProductEntity {
private String syqsfxyjxmj;
private String mjfs;
private String categoryName;
public Boolean getAllowNoBatch() {
if (allowNoBatch == null)
return false;
return allowNoBatch;
}
public Boolean getAllowNoExpire() {
if (allowNoExpire == null)
return false;
return allowNoExpire;
}
public Boolean getAllowNoProduct() {
if (allowNoProduct == null)
return false;
return allowNoProduct;
}
public Boolean getAllowNoSerial() {
if (allowNoSerial == null)
return false;
return allowNoSerial;
}
private Date updateTime;
}

1
src/main/java/com/glxp/api/entity/inv/InnerOrderEntity.java
Unescape Escape View File

@ -16,4 +16,5 @@ public class InnerOrderEntity {
private String remark;
private String createUser;
private int status;
private String createByName;
}

8
src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java
Unescape Escape View File

@ -111,6 +111,13 @@ public class PurOrderEntity {
@TableField(value = "applyAuditUser")
private String applyAuditUser;
/**
* 申购仓库
*/
@TableField(value = "applyInv")
private String applyInv;
/**
* 申购说明
*/
@ -141,6 +148,7 @@ public class PurOrderEntity {
@TableField(value = "arrivalTime")
private Date arrivalTime;
public static final String COL_ID = "id";
public static final String COL_BILLNO = "billNo";

12
src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java
Unescape Escape View File

@ -4,13 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import lombok.Data;
@Data
@TableName(value = "pur_plan")
public class PurPlanEntity {
@TableId(value = "id", type = IdType.INPUT)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
@ -103,6 +105,12 @@ public class PurPlanEntity {
@TableField(value = "applyCreateUser")
private String applyCreateUser;
/**
* 申购仓库
*/
@TableField(value = "applyInv")
private String applyInv;
/**
* 申购审核人
*/
@ -175,4 +183,4 @@ public class PurPlanEntity {
public static final String COL_APPLYBILLNO = "applyBillNo";
public static final String COL_STOCKORDERNO = "stockOrderNo";
}
}

18
src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java
Unescape Escape View File

@ -45,7 +45,7 @@ import com.glxp.api.idc.utils.TableUtils;
import com.glxp.api.req.system.ScheduledRequest;
import com.glxp.api.service.system.SystemParamConfigService;
import com.glxp.api.util.CustomUtil;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.MsDateUtil;
import com.glxp.api.util.FileUtils;
import lombok.extern.slf4j.Slf4j;
@ -313,7 +313,7 @@ public class IdcServiceImpl implements IdcService {
String lastUpdateTime = getUpdateTime(tnames[2] + "." + tnames[0] + "." + tnames[1] + ".delete");
Date nowUpdateTime = new Date();
String where = "tableName='" + tnames[2].toLowerCase() + "' and updateTime between cast('" + lastUpdateTime + "' as datetime) " +
" and cast('" + DateUtil.formatDate(nowUpdateTime, "yyyy-MM-dd HH:mm:ss") + "' as datetime)";
" and cast('" + MsDateUtil.formatDate(nowUpdateTime, "yyyy-MM-dd HH:mm:ss") + "' as datetime)";
Map<String, Object> count = new HashMap<String, Object>();
count.put("sql", "select count(*) from idc_delete where " + where);
int total = dbDao.count(count);
@ -425,7 +425,7 @@ public class IdcServiceImpl implements IdcService {
if (!StringUtils.isEmpty(updateTimeColumn)) {
sqlWhere += " " + updateTimeColumn + " between cast('" + lastUpdateTime + "' as datetime) and cast('" + DateUtil.formatDate(nowUpdateTime, "yyyy-MM-dd HH:mm:ss") + "' as datetime)";
sqlWhere += " " + updateTimeColumn + " between cast('" + lastUpdateTime + "' as datetime) and cast('" + MsDateUtil.formatDate(nowUpdateTime, "yyyy-MM-dd HH:mm:ss") + "' as datetime)";
//sqlWhere += " and not exists (select fkId from idc_record where type='" + tnames[2] + "' and fkId=" + tnames[2] + "." + keyColumn + " and createTime>date_sub(now(),interval 15 MINUTE))";
} else {
sqlWhere = "not exists (select fkId from idc_record where type='" + tnames[2] + "' and fkId=" + tnames[2] + "." + keyColumn + ")";
@ -449,13 +449,13 @@ public class IdcServiceImpl implements IdcService {
if (!StringUtils.isEmpty(cron)) {
CronSequenceGenerator cronSequenceGenerator = new CronSequenceGenerator(cron);
Date nextTimePoint = cronSequenceGenerator.next(DateUtil.parseDate(lastUpdateTime));
Date nextTimePoint = cronSequenceGenerator.next(MsDateUtil.parseDate(lastUpdateTime));
sync = nextTimePoint.before(nowUpdateTime);
}
if (sync) {
result = syncMasterData(map, isUpload, syncIp);
if (result) {
setUpdateTime(tnames[2] + "." + tnames[0] + "." + tnames[1], DateUtil.formatDate(nowUpdateTime, "yyyy-MM-dd HH:mm:ss"));
setUpdateTime(tnames[2] + "." + tnames[0] + "." + tnames[1], MsDateUtil.formatDate(nowUpdateTime, "yyyy-MM-dd HH:mm:ss"));
}
}
//}
@ -546,7 +546,7 @@ public class IdcServiceImpl implements IdcService {
JSONObject json = JSONObject.parseObject(content);
String filePathSlash = filePath.substring(filePath.length() - 1).equals("/") ? "" : "/";
String backFileSlash = backFilePath.substring(backFilePath.length() - 1).equals("/") ? "" : "/";
String datePath = DateUtil.formatDate(new Date(), "yyyy-MM-dd");
String datePath = MsDateUtil.formatDate(new Date(), "yyyy-MM-dd");
String fileName = filePath + filePathSlash + datePath + "/" + json.getString("messageType") + "-" + json.getString("messageId") + ".udi";
String backFileName = backFilePath + backFileSlash + datePath + "/" + json.getString("messageType") + "-" + json.getString("messageId") + ".udi";
if (!FileUtils.makeDirectory(filePath + filePathSlash + datePath))
@ -842,7 +842,7 @@ public class IdcServiceImpl implements IdcService {
boolean isEnd, boolean isReceive) {
try {
String content = JSON.toJSONString(json);
String datePath = DateUtil.formatDate(new Date(), "yyyy-MM-dd");
String datePath = MsDateUtil.formatDate(new Date(), "yyyy-MM-dd");
String fileName = filePath + datePath + "/" + json.get("messageType") + "-" + json.get("messageId") + ".udi";
String backFileName = backFilePath + datePath + "/" + json.get("messageType") + "-" + json.get("messageId") + ".udi";
if (!FileUtils.makeDirectory(filePath + datePath))
@ -1011,7 +1011,7 @@ public class IdcServiceImpl implements IdcService {
if (list.get(i).get(keyColumn[z]) != null && !StringUtils.isEmpty(list.get(i).get(keyColumn[z]).toString())) {
updateWhere += !StringUtils.isEmpty(updateWhere) ? " and " : " ";
String value = list.get(i).get(keyColumn[z]) != null ? list.get(i).get(keyColumn[z]).toString() : "";
value = keyDataType[z].equals("D") ? "cast('" + DateUtil.formatDate(IDCUtils.parseDate(value), "yyyy-MM-dd HH:mm:ss") + "' as datetime)" : value;
value = keyDataType[z].equals("D") ? "cast('" + MsDateUtil.formatDate(IDCUtils.parseDate(value), "yyyy-MM-dd HH:mm:ss") + "' as datetime)" : value;
updateWhere += keyColumn[z] + " = " + (keyDataType[z].equals("C") ? "'" : "") + value + (keyDataType[z].equals("C") ? "'" : "");
}
}
@ -1397,7 +1397,7 @@ public class IdcServiceImpl implements IdcService {
String updateTime = "";
Map<String, Object> map = dbDao.get("select * from idc_status where id='" + id + "'");
if (map != null && map.get("id") != null) {
updateTime = DateUtil.formatDate(IDCUtils.parseDate(map.get("statusTime").toString()), "yyyy-MM-dd HH:mm:ss");
updateTime = MsDateUtil.formatDate(IDCUtils.parseDate(map.get("statusTime").toString()), "yyyy-MM-dd HH:mm:ss");
} else {
//国家库数据
if (id.equals("productinfo")) {

94
src/main/java/com/glxp/api/idc/utils/DBAUtils.java
Unescape Escape View File

@ -9,7 +9,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.MsDateUtil;
@ -20,7 +20,7 @@ import com.glxp.api.util.DateUtil;
public class DBAUtils {
private static final Logger logger = LoggerFactory.getLogger(DBAUtils.class);
private static final String keywords = ",limit,offset,sort,order,isLike,menuId,menuCode,page,isAuto,pageNo,pageSize,pageNum,sqlOrder,join,";
/*解析where条件*/
public static String parseWhere(String sql,Map<String,Object> columns,Map<String,Object> params,String dataWhere) {
return parseWhere(sql,columns,params,dataWhere,false);
@ -29,7 +29,7 @@ public class DBAUtils {
String where="";
boolean isAnd0 = false;
boolean isLike = params!=null&&params.get("isLike")!=null&&params.get("isLike").toString().equals("true") ? true : false;
if(sql.contains("sqlWhere")||!sql.contains("<if")) {
where = convertWhere(columns,params,dataWhere,sql);
if(!sql.contains("<if")&&!StringUtils.isEmpty(where)) {
@ -66,7 +66,7 @@ public class DBAUtils {
n=0;
continue;
}
int c = sql.indexOf("</if>");
String str = sql.substring(b+1,c);
int e1 = str.indexOf("#{");
@ -99,8 +99,8 @@ public class DBAUtils {
}
sql = sql.length()>c+5 ? sql.substring(0,a) +str+sql.substring(c+5) : sql.substring(0,a) +str;
}
}
}
if(sql.contains("<where>")) {
sql = n>0 ? sql.replaceAll("<where>", " where ") : sql.replaceAll("<where>", "");
if(!StringUtils.isEmpty(dataWhere)&&!sql.contains("sqlWhere")) {
@ -113,7 +113,7 @@ public class DBAUtils {
int a1,a2,b1,b2;
a1 = sql.indexOf("[==isLike]");
a2 = sql.indexOf("</if>",a1+1);
if(a1>0&&a2>0) {
if(isLike) {
sql = sql.length()>a2+5 ? sql.substring(0,a1)+sql.substring(a1 +10, a2) +sql.substring(a2+5) : sql.substring(0,a1)+sql.substring(a1 +10, a2);
@ -131,11 +131,11 @@ public class DBAUtils {
}
}
}
sql =parseParams(sql,columns,params);
return sql;
}
public static String parseParams(String sql,Map<String,Object> columns,Map<String,Object> params) {
String[] iStr={"#{","${"};
for(int k=0;k<2;k++) {
@ -153,12 +153,12 @@ public class DBAUtils {
sql = sql.substring(0,a1)+(dataType.equals("0") ? "'" : "")+value+(dataType.equals("0") ? "'" : "")+sql.substring(a2 +1);
}
}
return sql;
}
/*生成where条件*/
public static String convertWhere(Map<String,Object> colums,Map<String,Object> params,String dataWhere) {
String where=convertWhere(colums,params,dataWhere,"");
@ -181,7 +181,7 @@ public class DBAUtils {
if(obj!=null)
value = obj.toString();
if(!StringUtils.isEmpty(value)&&!keywords.contains(","+key+",")&&(StringUtils.isEmpty(sql)||(!StringUtils.isEmpty(sql)&&!sql.contains("{"+key+"}")))) {
if(key.equals("sqlWhere")||key.equals("join")) {
where+=(!StringUtils.isEmpty(where) ? " and " : "") +" "+value;
} else {
@ -189,12 +189,12 @@ public class DBAUtils {
String wh = "";
for (String cn:cns) {
String columnName = cn;//StringUtils.propertyToField(cn);
if(colums!=null&&isKey&&colums.get(cn)==null) {
logger.error("列名"+columnName+"不存在,属性"+cn+"错误.");
} else {
if(!StringUtils.isEmpty(wh))
if(!StringUtils.isEmpty(wh))
wh+=" or ";
if(isLike) {
wh+="instr("+columnName+",'"+value+"')>0";
@ -207,21 +207,21 @@ public class DBAUtils {
}
}
}
if(!StringUtils.isEmpty(dataWhere)) {
if(!StringUtils.isEmpty(where)) {
where = "("+where+") and ("+dataWhere+")";
} else {
where = dataWhere;
}
}
if(!StringUtils.isEmpty(where))
}
if(!StringUtils.isEmpty(where))
where = "("+where+")";
return where;
}
/*生成insert语句*/
public static String parseInsert(Map<String,Object> params,Map<String,Object> columns) {
String ins="";
@ -229,28 +229,28 @@ public class DBAUtils {
String sql="";
for(String key : columns.keySet()){
String value = "";
if(params.get(key)!=null)
value = params.get(key).toString();
Map<String,Object> map = (Map<String, Object>) columns.get(key);
String dataType = map.get("dataType").toString();
String extra = map.get("extra")!=null&&map.get("extra").toString().toLowerCase().contains("auto") ? "A" : "N";
if(map.get("columnKey").toString().equals("PRI")&&extra.equals("N")) {
if(StringUtils.isEmpty(value)) {
}
}
value = DBAUtils.escape(value);
if(!StringUtils.isEmpty(value)) {
if(!StringUtils.isEmpty(ins))
ins+=",";
ins+=map.get("columnName").toString();
if(!StringUtils.isEmpty(vas))
vas+=",";
if(StringUtils.isEmpty(value)) {
vas+="null";
} else {
@ -263,39 +263,39 @@ public class DBAUtils {
Date date = new Date();
if(StringUtils.isNumeric(value)) {
date = new Date(Long.valueOf(value));
str = DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss");
str = MsDateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss");
} else {
str = DateUtil.formatDate(IDCUtils.parseDate(value),"yyyy-MM-dd HH:mm:ss");
str = MsDateUtil.formatDate(IDCUtils.parseDate(value),"yyyy-MM-dd HH:mm:ss");
}
vas+="cast('"+str+"' as datetime)";
}
}
}
}
if(!StringUtils.isEmpty(ins)&&!StringUtils.isEmpty(vas)) {
sql = "("+ins+") values ("+vas+")";
}
}
return sql;
}
public static String convertColumnType(String dataType,String dbType,String width) {
String columnType = dataType.toLowerCase();
if(dbType.contains("oracle.")) {
columnType = columnType.contains("varchar") ? width.contains("(") ? ("varchar2" +width) : ("varchar2(" +width+")") :
columnType.contains("char") ? width.contains("(") ? ("char" +width) : ("char(" +width+")") :
columnType.contains("char") ? width.contains("(") ? ("char" +width) : ("char(" +width+")") :
columnType.contains("date")||columnType.contains("time") ? "date" :
columnType.contains("int")||columnType.contains("num")||columnType.contains("dec") ? width.contains("(") ? ("number"+width+"") : ("number("+width+")") : "";
} else {
columnType = columnType.contains("varchar") ? width.contains("(") ? ("varchar" +width) : ("varchar(" +width+")") :
columnType.contains("char") ? width.contains("(") ? ("char" +width) : ("char(" +width+")") :
columnType.contains("char") ? width.contains("(") ? ("char" +width) : ("char(" +width+")") :
columnType.contains("date")||columnType.contains("time") ? "datetime" :
columnType.contains("int")||columnType.contains("num")||columnType.contains("dec") ? width !=null && width.contains(",") ? width.contains("(") ? ("decimal"+width+"") : ("decimal("+width+")") : "int" : "";
}
return columnType;
}
private static String aliasNameChars = "_hijklmnopqrstuvwxyzabcdefg9876543210";
@ -343,7 +343,7 @@ public class DBAUtils {
}
return result;
}
public static String tableJoinWhere(String tableName,Map<String,Object> columns) {
String result = "";
if(tableName.contains(",")) {
@ -353,10 +353,10 @@ public class DBAUtils {
//result = mTname+".id="+sTname+"."+mTname+"_id";
}
return result;
}
/*从update语句解析select*/
public static String updateSqlToSelectSql(String sql,Map<String,Object> map) {
String aSql = sql.toLowerCase();
@ -386,7 +386,7 @@ public class DBAUtils {
}
return result;
}
public static String escape(String str) {
String value = str;
if(value!=null&&value.contains("'")) {
@ -395,6 +395,6 @@ public class DBAUtils {
}
return value;
}
}

1
src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java
Unescape Escape View File

@ -26,5 +26,6 @@ public class BasicUnitMaintainFilterRequest extends ListPageRequest {
private Integer outType;
private Boolean isDownThrSys;
private String lastUpdateTime;
private List<Integer> corpTypeList;
List<BasicErpUnitsResponse>thrCorpEntities;
}

2
src/main/java/com/glxp/api/res/inout/IoUploadOrderResponse.java
Unescape Escape View File

@ -9,7 +9,7 @@ import java.util.List;
public class IoUploadOrderResponse {
private List<IoOrderDetailCodeEntity> ioOrderDetailCodeEntityList;
private List<IoCodeTempEntity> ioCodeTempEntityList;
private List<IoCodeEntity> ioCodeEntityList;
private IoOrderEntity ioOrderEntity;
private PlatformLinkResponse platformLinkRespons;
private List<IoOrderDetailBizEntity> ioOrderDetailBizEntityList;

1
src/main/java/com/glxp/api/res/inout/PlatformLinkResponse.java
Unescape Escape View File

@ -40,5 +40,6 @@ public class PlatformLinkResponse {
private String name;
private String host;
private String appid;
private String apiKey;
private String secretKey;
}

1
src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java
Unescape Escape View File

@ -63,6 +63,7 @@ public class PurOrderResponse {
private String applyAuditBy; //申购审核人
private String applyRemark; //申购说明
private String applyBillNo; //申购单据号，多单以逗号隔开
private String applyInvName;
private String stockOrderNo;

2
src/main/java/com/glxp/api/res/purchase/PurPlanResponse.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.res.purchase;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.util.Date;
@ -61,6 +62,7 @@ public class PurPlanResponse {
private String applyCreateBy; //申购人
private String applyAuditBy; //申购审核人
private String applyInvName;
private String applyRemark; //申购说明
private String applyBillNo; //申购单据号，多单以逗号隔开

2
src/main/java/com/glxp/api/res/thrsys/ThrErpOrderResponse.java
Unescape Escape View File

@ -5,7 +5,7 @@ import lombok.Data;
import java.math.BigDecimal;
@Data
public class ThrErpOrderResponse {
public class ThrErpOrderResponse {
private long id;

5
src/main/java/com/glxp/api/res/thrsys/ThrOrderResponse.java
Unescape Escape View File

@ -16,9 +16,8 @@ public class ThrOrderResponse {
private String billType;
private String billFlag;
private String originType;
private String locStorageCode;
private String invWarehouseCode;//当前分库
private String fromSubInvCode; //往来分库
private String invCode;
private String fromInvCode; //往来仓库
private String thirdSysFk;

2
src/main/java/com/glxp/api/res/thrsys/ThrUnitMaintainResponse.java
Unescape Escape View File

@ -8,7 +8,7 @@ import java.util.Date;
@Data
public class ThrUnitMaintainResponse {
private Integer id;
private Long id;
private String erpId;
@NotBlank(message = "往来单位名称不能为空！")

3
src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java
Unescape Escape View File

@ -1,6 +1,5 @@
package com.glxp.api.service.basic;
import cn.hutool.core.util.IdUtil;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.entity.basic.UdiProductEntity;
@ -117,7 +116,7 @@ public class BasicBackUpdateProductService {
udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId4());
}
udiRelevanceEntity1.setThirdId(invmandocResponse.getCode());
String time = DateUtil.getDateTime();
String time = MsDateUtil.getDateTime();
udiRelevanceEntity1.setUpdateTime(new Date());
udiRelevanceEntity.setModifyTime(new Date());
udiRelevanceEntity.setIsDisable(false);

2
src/main/java/com/glxp/api/service/basic/BasicCorpService.java
Unescape Escape View File

@ -35,7 +35,7 @@ public interface BasicCorpService {
boolean isExit();
boolean insertThrUnitMaintainignore(ThrUnitMaintainResponse thrUnitMaintainResponse);
boolean insertThrUnitMaintainignore(BasicCorpEntity thrUnitMaintainResponse);
List<BasicCorpEntity> batchSelectByIds(List<Integer> id);

21
src/main/java/com/glxp/api/service/basic/BasicProductCategoryServiceImpl.java
Unescape Escape View File

@ -187,5 +187,26 @@ public class BasicProductCategoryServiceImpl implements BasicProductCategoryServ
return basicProductCategoryRelMapper.deleteById(id)>0;
}
@Override
public boolean checkExist(String code) {
List<BasicProductCategory> list = basicProductCategoryMapper.selectList(new QueryWrapper<BasicProductCategory>().eq("parentCode", code));
if(list != null && list.size()>0){
return true;
}
return false;
}
@Override
public boolean checkrel(String code) {
List<BasicProductCategoryRel> relList = basicProductCategoryRelMapper.selectList(new QueryWrapper<BasicProductCategoryRel>().eq("code", code));
if(relList != null && relList.size() > 0){
return true;
}
return false;
}
}

4
src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java
Unescape Escape View File

@ -16,7 +16,7 @@ import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.service.thrsys.ThrProductsService;
import com.glxp.api.service.thrsys.ThrSystemService;
import com.glxp.api.util.CustomUtil;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.MsDateUtil;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.HttpClient;
import com.glxp.api.util.udi.FilterUdiUtils;
@ -76,7 +76,7 @@ public class BasicUpdateProductService {
udiProductEntity.setDiType(ConstantStatus.DI_TYPE_MAIN);
udiProductService.insertUdiInfo(udiProductEntity);
udiRelevanceEntity1.setUuid(udiProductEntity.getUuid());
String time = DateUtil.getDateTime();
String time = MsDateUtil.getDateTime();
udiRelevanceEntity1.setUpdateTime(new Date());
udiRelevanceEntity1.setModifyTime(new Date());
ThrSystemEntity thrSystemEntity = thrSystemService.selectMainThrSys();

1
src/main/java/com/glxp/api/service/basic/UdiContrastService.java
Unescape Escape View File

@ -15,7 +15,6 @@ import com.glxp.api.req.thrsys.FilterThrProductsRequest;
import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.service.thrsys.ThrProductsService;
import com.glxp.api.util.CustomUtil;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.udi.UdiInfoUtil;

12
src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java
Unescape Escape View File

@ -38,7 +38,7 @@ public class BasicCorpServiceImpl implements BasicCorpService {
}
@Override
public boolean insertThrUnitMaintainignore(ThrUnitMaintainResponse thrUnitMaintainResponse) {
public boolean insertThrUnitMaintainignore(BasicCorpEntity thrUnitMaintainResponse) {
thrUnitMaintainResponse.setUpdateTime(new Date());
return basicCorpDao.insertThrUnitMaintainignore(thrUnitMaintainResponse);
}
@ -50,21 +50,21 @@ public class BasicCorpServiceImpl implements BasicCorpService {
@Override
public boolean insert(BasicCorpEntity basicUnitMaintainEntity) {
return basicCorpDao.insert(basicUnitMaintainEntity)>0?true:false;
return basicCorpDao.insert(basicUnitMaintainEntity) > 0 ? true : false;
}
@Override
public boolean updateById(BasicCorpEntity basicUnitMaintainSaveRequest) {
basicUnitMaintainSaveRequest.setUpdateTime(new Date());
return basicCorpDao.customUpdateById(basicUnitMaintainSaveRequest)>0?true:false;
return basicCorpDao.customUpdateById(basicUnitMaintainSaveRequest) > 0 ? true : false;
}
@Override
public boolean updateByErpId(BasicCorpEntity basicCorpEntity) {
basicCorpEntity.setUpdateTime(new Date());
QueryWrapper<BasicCorpEntity> ew=new QueryWrapper<>();
ew.eq("erpId",basicCorpEntity.getErpId());
return basicCorpDao.update(basicCorpEntity,ew)>0?true:false;
QueryWrapper<BasicCorpEntity> ew = new QueryWrapper<>();
ew.eq("erpId", basicCorpEntity.getErpId());
return basicCorpDao.update(basicCorpEntity, ew) > 0 ? true : false;
}
@Override

4
src/main/java/com/glxp/api/service/basic/impl/BasicProductCategoryService.java
Unescape Escape View File

@ -34,6 +34,10 @@ public interface BasicProductCategoryService {
boolean deleterelByid(Integer id);
boolean checkExist(String code);
boolean checkrel(String code);
}

4
src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java
Unescape Escape View File

@ -26,7 +26,7 @@ import com.glxp.api.service.system.SystemParamConfigService;
import com.glxp.api.service.thrsys.ThrDataService;
import com.glxp.api.service.thrsys.ThrSystemService;
import com.glxp.api.util.CustomUtil;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.MsDateUtil;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.HttpClient;
import org.springframework.beans.BeanUtils;
@ -254,7 +254,7 @@ public class BasicProductsImportLogServiceImpl implements BasicProductsImportLog
public void updateValue(UdiRelevanceEntity udiRelevanceEntity, BasicProductsImportDetailEntity basicProductsImportDetailEntity,
BasicProductsImportLogEntity basicProductsImportLogEntity, String mainId) {
String time = DateUtil.getDateTime();
String time = MsDateUtil.getDateTime();
udiRelevanceEntity.setUpdateTime(new Date());
udiRelevanceEntity.setModifyTime(new Date());
if (basicProductsImportDetailEntity.getIsUseDy() != null && !basicProductsImportDetailEntity.getIsUseDy().trim().equals("")) {

9
src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
Unescape Escape View File

@ -6,7 +6,6 @@ import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.Constant;
@ -30,7 +29,7 @@ import com.glxp.api.service.basic.UdiRlSupService;
import com.glxp.api.service.inv.InvProductDetailService;
import com.glxp.api.service.system.SystemParamConfigService;
import com.glxp.api.util.CustomUtil;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.MsDateUtil;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.OrderNoTypeBean;
import com.glxp.api.util.udi.FilterUdiUtils;
@ -442,7 +441,7 @@ public class IoAddInoutService {
codeEnttity.setInvCode(orderEntity.getInvCode());
codeEnttity.setReCount(codeEnttity.getCount() * udiCalCountUtil.getActCount(codeEnttity.getNameCode()));
codeEnttity.setUpdateTime(new Date());
codeEnttity.setCreateTime(DateUtil.parseDate(pdaCodeEntity.getActDate()));
codeEnttity.setCreateTime(MsDateUtil.parseDate(pdaCodeEntity.getActDate()));
ioCodeEnttities.add(codeEnttity);
}
codeTempService.insertBatch(ioCodeEnttities);
@ -481,7 +480,7 @@ public class IoAddInoutService {
if (pdaCodeEntities != null && pdaCodeEntities.size() > 0) {
PdaCodeEntity pdaCodeEntity = pdaCodeEntities.get(0);
if (pdaCodeEntity.getActDate() != null) {
orderSaveRequest.setCreateTime(DateUtil.parseDate(pdaCodeEntity.getActDate()));
orderSaveRequest.setCreateTime(MsDateUtil.parseDate(pdaCodeEntity.getActDate()));
}
//写入条码
List<IoCodeTempEntity> ioCodeEnttities = new ArrayList<>();
@ -495,7 +494,7 @@ public class IoAddInoutService {
codeEnttity.setInvCode(orderSaveRequest.getInvCode());
codeEnttity.setReCount(codeEnttity.getCount() * udiCalCountUtil.getActCount(codeEnttity.getNameCode()));
codeEnttity.setUpdateTime(new Date());
codeEnttity.setCreateTime(DateUtil.parseDate(pdaCodeEntity.getActDate()));
codeEnttity.setCreateTime(MsDateUtil.parseDate(pdaCodeEntity.getActDate()));
ioCodeEnttities.add(codeEnttity);
}
codeTempService.insertBatch(ioCodeEnttities);

6
src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java
Unescape Escape View File

@ -12,15 +12,13 @@ import com.glxp.api.entity.basic.BasicBusTypePreEntity;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.entity.inout.*;
import com.glxp.api.entity.inv.InvProductDetailEntity;
import com.glxp.api.entity.system.SystemParamConfigEntity;
import com.glxp.api.service.auth.InvWarehouseService;
import com.glxp.api.service.basic.IBasicBusTypePreService;
import com.glxp.api.service.basic.IBasicBussinessTypeService;
import com.glxp.api.service.inv.InvProductDetailService;
import com.glxp.api.service.inv.InvProductService;
import com.glxp.api.service.system.SystemParamConfigService;
import com.glxp.api.util.CustomUtil;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.MsDateUtil;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.OrderNoTypeBean;
import org.springframework.beans.BeanUtils;
@ -186,7 +184,7 @@ public class IoChangeInoutService {
outOrder.setId(null);
outOrder.setSupplementNo(null);//补单需置空
if (bussinessChangeTypeEntity.getBeforeTime() != null)
outOrder.setCreateTime(DateUtil.getBeforeDay(DateUtil.fromDate(orderEntity), bussinessChangeTypeEntity.getBeforeTime()));
outOrder.setCreateTime(MsDateUtil.getBeforeDay(MsDateUtil.fromDate(orderEntity), bussinessChangeTypeEntity.getBeforeTime()));
else
outOrder.setCreateTime(new Date()); //不设，默认为当前时间
outOrder.setAction(targetBustypeEntity.getAction());

8
src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
Unescape Escape View File

@ -329,7 +329,6 @@ public class IoCheckInoutService {
codeService.insert(codeEnttity);
}
codeTempService.deleteByBillNo(orderEntity.getBillNo());
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_SUCCESS);
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
orderEntity.setUpdateTime(new Date());
@ -748,7 +747,9 @@ public class IoCheckInoutService {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
}
}
if (StrUtil.isEmpty(orderEntity.getCheckUser())) {
orderEntity.setCheckUser(orderEntity.getCreateUser());
}
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_REW);
orderEntity.setUpdateTime(new Date());
@ -810,6 +811,9 @@ public class IoCheckInoutService {
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_CHECK);
orderEntity.setUpdateTime(new Date());
orderEntity.setAuditTime(new Date());
if (StrUtil.isEmpty(orderEntity.getReviewUser())) {
orderEntity.setReviewUser(orderEntity.getReviewUser());
}
orderService.update(orderEntity);
genInv(orderEntity, bussinessTypeEntity);
}

14
src/main/java/com/glxp/api/service/inout/IoGenInvService.java
Unescape Escape View File

@ -1,29 +1,15 @@
package com.glxp.api.service.inout;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.constant.Constant;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.constant.ConstantType;
import com.glxp.api.entity.auth.InvWarehouseEntity;
import com.glxp.api.entity.basic.BasicBusTypePreEntity;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.entity.basic.UdiRelevanceEntity;
import com.glxp.api.entity.inout.IoCodeEntity;
import com.glxp.api.entity.inout.IoCodeTempEntity;
import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.inv.*;
import com.glxp.api.entity.system.SystemParamConfigEntity;
import com.glxp.api.service.auth.InvWarehouseService;
import com.glxp.api.service.basic.IBasicBusTypePreService;
import com.glxp.api.service.basic.IBasicBussinessTypeService;
import com.glxp.api.service.inv.*;
import com.glxp.api.service.system.SystemParamConfigService;
import com.glxp.api.util.CustomUtil;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.OrderNoTypeBean;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

6
src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
Unescape Escape View File

@ -43,7 +43,7 @@ import com.glxp.api.service.inout.*;
import com.glxp.api.service.inv.*;
import com.glxp.api.service.system.SyncUploadDataBustypeService;
import com.glxp.api.service.thrsys.ThrOrderUploadBustypesService;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.MsDateUtil;
import com.glxp.api.util.IntUtil;
import com.glxp.api.util.udi.UdiCalCountUtil;
import lombok.extern.slf4j.Slf4j;
@ -770,8 +770,8 @@ public class IoOrderServiceImpl implements IoOrderService {
public void updateOrderInfo(OrderEditRequest orderEditRequest) {
log.info("批量更新单据信息，参数列表： {}", JSONUtil.toJsonStr(orderEditRequest));
IoOrderEntity order = new IoOrderEntity();
order.setCreateTime(DateUtil.parseDate(orderEditRequest.getCreateTime()));
order.setAuditTime(DateUtil.parseDate(orderEditRequest.getAuditTime()));
order.setCreateTime(MsDateUtil.parseDate(orderEditRequest.getCreateTime()));
order.setAuditTime(MsDateUtil.parseDate(orderEditRequest.getAuditTime()));
order.setUpdateTime(new Date());
orderDao.update(order, new QueryWrapper<IoOrderEntity>().in("billNo", orderEditRequest.getOrderIds()));
}

64
src/main/java/com/glxp/api/service/inout/impl/PlatformServiceImpl.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.service.inout.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.net.URLEncodeUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpUtil;
@ -35,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.File;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.*;
import java.util.concurrent.TimeUnit;
@ -61,6 +63,8 @@ public class PlatformServiceImpl implements PlatformService {
IoOrderDetailResultDao ioOrderDetailResultDao;
@Resource
IoOrderInvoiceMapper ioOrderInvoiceMapper;
@Resource
IoCodeService ioCodeService;
@Value("${file_path}")
private String filePath;
@Value("${API_KEY}")
@ -318,49 +322,59 @@ public class PlatformServiceImpl implements PlatformService {
return ResultVOUtils.error(999, "该单据不存在!");
}
//查询客户关联信息
PlatformLinkResponse platformLinkRespons = unitMaintainPlatformDao.selectByUnitld(ioOrderEntity.getFromCorp());
if(platformLinkRespons == null){
PlatformLinkResponse platformLinkRespons = unitMaintainPlatformDao.selectByUnitld(ioOrderEntity.getFromCorp(), ioOrderEntity.getAction());
if (platformLinkRespons == null) {
return ResultVOUtils.error(999, "该单没有设置补单条件!");
}
//获取单据详情
List<IoOrderDetailCodeEntity> ioOrderDetailCodeEntityList=ioOrderDetailCodeService.findByOrderId(orderId);
List<IoCodeTempEntity> ioCodeTempEntityList = ioCodeTempService.findByOrderId(orderId);
for (IoCodeTempEntity ioCodeTempEntity : ioCodeTempEntityList) {
Map<String, String> jsonMap = new HashMap<>();
jsonMap.put("code", ioCodeTempEntity.getCode());
ObjectMapper mapper = new ObjectMapper();
String json = mapper.writeValueAsString(jsonMap);
ioCodeTempEntity.setCode(json);
List<IoOrderDetailCodeEntity> ioOrderDetailCodeEntityList = ioOrderDetailCodeService.findByOrderId(orderId);
List<IoCodeEntity> ioCodeEntityList = ioCodeService.findByOrderId(orderId);
for (IoCodeEntity ioCodeTempEntity : ioCodeEntityList) {
String code = URLEncodeUtil.encode(ioCodeTempEntity.getCode());
ioCodeTempEntity.setCode(code);
}
ArrayList<String> list = new ArrayList<>();
//获取业务单
QueryWrapper<IoOrderDetailBizEntity> ew=new QueryWrapper<>();
ew.eq("orderIdFk",orderId);
List<IoOrderDetailBizEntity> ioOrderDetailBizEntityList=ioOrderDetailBizDao.selectList(ew);
QueryWrapper<IoOrderDetailBizEntity> ew = new QueryWrapper<>();
ew.eq("orderIdFk", orderId);
List<IoOrderDetailBizEntity> ioOrderDetailBizEntityList = ioOrderDetailBizDao.selectList(ew);
for (IoOrderDetailBizEntity ioOrderDetailBizEntity : ioOrderDetailBizEntityList) {
if (StrUtil.isNotBlank(ioOrderDetailBizEntity.getFilePath())) {
list.add(filePath + "/register/image2/" + ioOrderDetailBizEntity.getFilePath());
ioOrderDetailBizEntity.setFilePath("as" + ioOrderDetailBizEntity.getFilePath());
}
if (StrUtil.isNotBlank(ioOrderDetailBizEntity.getColdFilePath())) {
list.add(filePath + "/register/image2/" + ioOrderDetailBizEntity.getColdFilePath());
ioOrderDetailBizEntity.setColdFilePath("as" + ioOrderDetailBizEntity.getColdFilePath());
}
}
//获取结果单
QueryWrapper<IoOrderDetailResultEntity> ew1=new QueryWrapper<>();
ew1.eq("orderIdFk",orderId);
List<IoOrderDetailResultEntity> ioOrderDetailResultEntityList=ioOrderDetailResultDao.selectList(ew1);
QueryWrapper<IoOrderDetailResultEntity> ew1 = new QueryWrapper<>();
ew1.eq("orderIdFk", orderId);
List<IoOrderDetailResultEntity> ioOrderDetailResultEntityList = ioOrderDetailResultDao.selectList(ew1);
//获取发票
QueryWrapper<IoOrderInvoiceEntity> ew2=new QueryWrapper<>();
ew2.eq("orderIdFk",orderId);
List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList=ioOrderInvoiceMapper.selectList(ew2);
ArrayList<String> list=new ArrayList<>();
QueryWrapper<IoOrderInvoiceEntity> ew2 = new QueryWrapper<>();
ew2.eq("orderIdFk", orderId);
List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList = ioOrderInvoiceMapper.selectList(ew2);
for (IoOrderInvoiceEntity ioOrderInvoiceEntity : ioOrderInvoiceEntityList) {
if(StrUtil.isNotBlank(ioOrderInvoiceEntity.getLicenseUrl())){
if (StrUtil.isNotBlank(ioOrderInvoiceEntity.getLicenseUrl())) {
list.add(filePath + "/register/image2/" + ioOrderInvoiceEntity.getLicenseUrl());
ioOrderInvoiceEntity.setLicenseUrl("as" + ioOrderInvoiceEntity.getLicenseUrl());
}
}
relayFile(list,platformLinkRespons.getHost());
//没有图片的时候不用上传
if (list.size() > 0) {
relayFile(list, platformLinkRespons.getHost());
}
//组装数据
String host = platformLinkRespons.getHost();
IoUploadOrderResponse ioUploadOrderResponse=new IoUploadOrderResponse();
IoUploadOrderResponse ioUploadOrderResponse = new IoUploadOrderResponse();
ioUploadOrderResponse.setIoOrderEntity(ioOrderEntity);
ioUploadOrderResponse.setPlatformLinkRespons(platformLinkRespons);
ioUploadOrderResponse.setIoCodeTempEntityList(ioCodeTempEntityList);
ioUploadOrderResponse.setIoCodeEntityList(ioCodeEntityList);
ioUploadOrderResponse.setIoOrderDetailCodeEntityList(ioOrderDetailCodeEntityList);
ioUploadOrderResponse.setIoOrderDetailResultEntityList(ioOrderDetailResultEntityList);
ioUploadOrderResponse.setIoOrderDetailBizEntityList(ioOrderDetailBizEntityList);
@ -403,7 +417,7 @@ public class PlatformServiceImpl implements PlatformService {
if (!StringUtils.isEmpty(files.get(i))) {
File file = new File(files.get(i));
String fileName = files.get(i);
fileName = "as"+ fileName.substring(fileName.lastIndexOf("/")+1);
fileName = "as" + fileName.substring(fileName.lastIndexOf("/") + 1);
builder.addFormDataPart("files", fileName,
RequestBody.create(MediaType.parse(fileType), file));
}

10
src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java
Unescape Escape View File

@ -4,28 +4,22 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.constant.ConstantType;
import com.glxp.api.dao.basic.BasicBussinessTypeDao;
import com.glxp.api.dao.basic.UdiProductDao;
import com.glxp.api.dao.inout.IoOrderDao;
import com.glxp.api.dao.inv.InvPreInProductDetailDao;
import com.glxp.api.dao.inv.InvPreProductDetailDao;
import com.glxp.api.entity.auth.InvSpace;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.inv.InvPreInProductDetailEntity;
import com.glxp.api.entity.inv.InvPreProductDetailEntity;
import com.glxp.api.entity.inv.InvPreinDetailEntity;
import com.glxp.api.entity.inv.InvProductDetailEntity;
import com.glxp.api.req.inv.FilterInvPreProductDetailRequest;
import com.glxp.api.req.inv.FilterInvProductDetailRequest;
import com.glxp.api.res.inv.InvPlaceDetailResponse;
import com.glxp.api.res.inv.InvPreProductDetailResponse;
import com.glxp.api.service.auth.InvSpaceService;
import com.glxp.api.service.inv.InvPreProductDetailService;
import com.glxp.api.service.inv.InvPreinProductDetailService;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.MsDateUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -158,7 +152,7 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe
//设置单据日期
IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("createTime").eq("billNo", response.getOrderId()));
if (order != null)
response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
response.setOrderTime(MsDateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
}
@Override

8
src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java
Unescape Escape View File

@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.constant.ConstantType;
import com.glxp.api.dao.basic.BasicBussinessTypeDao;
import com.glxp.api.dao.basic.UdiProductDao;
@ -13,17 +12,14 @@ import com.glxp.api.dao.inv.InvPreProductDetailDao;
import com.glxp.api.entity.auth.InvSpace;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.inv.InvPreInProductDetailEntity;
import com.glxp.api.entity.inv.InvPreProductDetailEntity;
import com.glxp.api.entity.inv.InvProductDetailEntity;
import com.glxp.api.req.inv.FilterInvPreProductDetailRequest;
import com.glxp.api.req.inv.FilterInvProductDetailRequest;
import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.res.inv.InvPlaceDetailResponse;
import com.glxp.api.res.inv.InvPreProductDetailResponse;
import com.glxp.api.service.auth.InvSpaceService;
import com.glxp.api.service.inv.InvPreProductDetailService;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.MsDateUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -152,7 +148,7 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic
//设置单据日期
IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("createTime").eq("billNo", response.getOrderId()));
if (order != null)
response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
response.setOrderTime(MsDateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
}
@Override

5
src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java
Unescape Escape View File

@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.glxp.api.constant.ConstantType;
import com.glxp.api.dao.auth.InvSpaceDao;
import com.glxp.api.dao.basic.BasicBussinessTypeDao;
import com.glxp.api.dao.basic.UdiProductDao;
import com.glxp.api.dao.inout.IoOrderDao;
@ -19,7 +18,7 @@ import com.glxp.api.res.inv.InvPlaceDetailResponse;
import com.glxp.api.res.inv.InvProductDetailResponse;
import com.glxp.api.service.auth.InvSpaceService;
import com.glxp.api.service.inv.InvProductDetailService;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.MsDateUtil;
import com.glxp.api.util.IntUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -172,7 +171,7 @@ public class InvProductDetailServiceImpl implements InvProductDetailService {
//设置单据日期
IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("createTime").eq("billNo", response.getOrderId()));
if (order != null)
response.setOrderTime(DateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
response.setOrderTime(MsDateUtil.toDateStr(order.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
}

10
src/main/java/com/glxp/api/service/inv/impl/InvRemindMsgServiceImpl.java
Unescape Escape View File

@ -18,7 +18,7 @@ import com.glxp.api.entity.inv.InvRemindSetEntity;
import com.glxp.api.req.inv.FilterInvRemindMsgRequest;
import com.glxp.api.res.inv.InvRemindMsgResponse;
import com.glxp.api.service.inv.InvRemindMsgService;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.MsDateUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -139,7 +139,7 @@ public class InvRemindMsgServiceImpl implements InvRemindMsgService {
invRemindMsgRequest.setType("4"); //库存过期预警
InvRemindMsgEntity msgEntity = getInvRemindMsgEntity(invRemindMsgRequest, invProductEntity);
//判断是否需要生成/刷新库存预警
if ((null == msgEntity.getNextRemindTime() || msgEntity.getNextRemindTime().getTime() <= new Date().getTime()) && StrUtil.isNotBlank(invProductEntity.getExpireDate()) && DateUtil.compareExpire(invProductEntity.getExpireDate(), null)) {
if ((null == msgEntity.getNextRemindTime() || msgEntity.getNextRemindTime().getTime() <= new Date().getTime()) && StrUtil.isNotBlank(invProductEntity.getExpireDate()) && MsDateUtil.compareExpire(invProductEntity.getExpireDate(), null)) {
//设置预警消息
msgEntity.setMsg(StrUtil.format("产品已过期，产品失效日期：{}", invProductEntity.getExpireDate()));
saveMsg(msgEntity);
@ -179,13 +179,13 @@ public class InvRemindMsgServiceImpl implements InvRemindMsgService {
Date updateTime = msgEntity.getUpdateTime();
switch (ignoreStatus) {
case 1: //忽略7天
msgEntity.setNextRemindTime(DateUtil.getAfterDay(updateTime, 7 * 24));
msgEntity.setNextRemindTime(MsDateUtil.getAfterDay(updateTime, 7 * 24));
break;
case 2: //忽略15天
msgEntity.setNextRemindTime(DateUtil.getAfterDay(updateTime, 15 * 24));
msgEntity.setNextRemindTime(MsDateUtil.getAfterDay(updateTime, 15 * 24));
break;
case 3: //忽略30天
msgEntity.setNextRemindTime(DateUtil.getAfterDay(updateTime, 30 * 24));
msgEntity.setNextRemindTime(MsDateUtil.getAfterDay(updateTime, 30 * 24));
break;
default:
break;

3
src/main/java/com/glxp/api/service/purchase/PurPlanService.java
Unescape Escape View File

@ -1,7 +1,6 @@
package com.glxp.api.service.purchase;
import com.glxp.api.entity.purchase.PurPlanEntity;
import com.glxp.api.req.purchase.PurPlanRequest;
import com.glxp.api.res.purchase.PurPlanResponse;
@ -21,5 +20,7 @@ public interface PurPlanService {
Boolean deleteById(long id);
PurPlanEntity selectById(Long id);
}

11
src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java
Unescape Escape View File

@ -35,12 +35,12 @@ public class PurPlanServiceImpl implements PurPlanService {
@Override
public Boolean insert(PurPlanEntity purPlanRequest) {
return purPlanDao.insert(purPlanRequest);
return purPlanDao.insert(purPlanRequest) > 0;
}
@Override
public Boolean update(PurPlanEntity purPlanRequest) {
return purPlanDao.update(purPlanRequest);
return purPlanDao.updateById(purPlanRequest) > 0;
}
@Override
@ -50,6 +50,11 @@ public class PurPlanServiceImpl implements PurPlanService {
@Override
public Boolean deleteById(long id) {
return purPlanDao.deleteById(id);
return purPlanDao.deleteById(id) > 0;
}
@Override
public PurPlanEntity selectById(Long id) {
return purPlanDao.selectById(id);
}
}

14
src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java
Unescape Escape View File

@ -13,7 +13,7 @@ import com.glxp.api.entity.purchase.SupCertRemindMsgEntity;
import com.glxp.api.req.purchase.FilterCertRemindMsgRequest;
import com.glxp.api.res.purchase.SupCertRemindMsgResponse;
import com.glxp.api.service.purchase.SupCertRemindMsgService;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.MsDateUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -88,13 +88,13 @@ public class SupCertRemindMsgImpl implements SupCertRemindMsgService {
Date updateTime = msgEntity.getUpdateTime();
switch (ignoreStatus) {
case 1: //忽略7天
msgEntity.setNextRemindTime(DateUtil.getAfterDay(updateTime, 7 * 24));
msgEntity.setNextRemindTime(MsDateUtil.getAfterDay(updateTime, 7 * 24));
break;
case 2: //忽略15天
msgEntity.setNextRemindTime(DateUtil.getAfterDay(updateTime, 15 * 24));
msgEntity.setNextRemindTime(MsDateUtil.getAfterDay(updateTime, 15 * 24));
break;
case 3: //忽略30天
msgEntity.setNextRemindTime(DateUtil.getAfterDay(updateTime, 30 * 24));
msgEntity.setNextRemindTime(MsDateUtil.getAfterDay(updateTime, 30 * 24));
break;
default:
break;
@ -192,15 +192,15 @@ public class SupCertRemindMsgImpl implements SupCertRemindMsgService {
switch (type) {
case 1: //供应商
idFk = supCertEntity.getCustomerId();
msg = "供应商资质过期，过期时间：" + DateUtil.formatDate(supCertEntity.getExpireDate(), "yyyy-MM-dd");
msg = "供应商资质过期，过期时间：" + MsDateUtil.formatDate(supCertEntity.getExpireDate(), "yyyy-MM-dd");
break;
case 2: //生产企业
idFk = supCertEntity.getManufacturerIdFk();
msg = "生产企业资质过期，过期时间：" + DateUtil.formatDate(supCertEntity.getExpireDate(), "yyyy-MM-dd");
msg = "生产企业资质过期，过期时间：" + MsDateUtil.formatDate(supCertEntity.getExpireDate(), "yyyy-MM-dd");
break;
case 3: //产品
idFk = supCertEntity.getProductIdFk();
msg = "产品资质过期，过期时间：" + DateUtil.formatDate(supCertEntity.getExpireDate(), "yyyy-MM-dd");
msg = "产品资质过期，过期时间：" + MsDateUtil.formatDate(supCertEntity.getExpireDate(), "yyyy-MM-dd");
break;
default:
break;

26
src/main/java/com/glxp/api/service/sync/HeartService.java
Unescape Escape View File

@ -32,7 +32,6 @@ import com.glxp.api.http.sync.SpGetHttpClient;
import com.glxp.api.idc.service.FileService;
import com.glxp.api.idc.service.IdcService;
import com.glxp.api.req.sync.SpsSyncDataRequest;
import com.glxp.api.res.inv.InnerOrderPrintResponse;
import com.glxp.api.res.sync.*;
import com.glxp.api.service.auth.*;
import com.glxp.api.service.basic.*;
@ -40,7 +39,7 @@ import com.glxp.api.service.inout.*;
import com.glxp.api.service.system.*;
import com.glxp.api.service.thrsys.*;
import com.glxp.api.util.CustomUtil;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.MsDateUtil;
import com.glxp.api.util.JsonUtils;
import com.glxp.api.util.RedisUtil;
import lombok.RequiredArgsConstructor;
@ -52,7 +51,6 @@ import org.apache.ibatis.session.TransactionIsolationLevel;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@ -140,7 +138,7 @@ public class HeartService {
basicExportStatusEntity1 = orderStatusEntity;
}
BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
basicExportStatusTimeEntity.setLastUpdateTime(MsDateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_SCAN_ORDER);
spsSyncOrderResponse.setTaskId(basicExportStatusEntity1.getId());
spsSyncOrderResponse.setType(NEW_ALL_ORDER);
@ -206,7 +204,7 @@ public class HeartService {
basicExportStatusEntity1 = orderStatusEntity;
}
BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
basicExportStatusTimeEntity.setLastUpdateTime(MsDateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_BUS_ORDER);
spsSyncOrderResponse.setTaskId(basicExportStatusEntity1.getId());
spsSyncOrderResponse.setType(BasicProcessStatus.ALL_BUS_ORDER);
@ -515,7 +513,7 @@ public class HeartService {
private String writeFile(String filePath, String fileDesc, String content) throws IOException {
filePath = String.format("%s/%s", filePath, DateUtil.getDate());
filePath = String.format("%s/%s", filePath, MsDateUtil.getDate());
String fileFullPath = String.format("%s/%s-%s.udi", filePath, fileDesc, IdUtil.fastSimpleUUID());
File file = new File(filePath);
if (!file.exists()) {
@ -523,7 +521,7 @@ public class HeartService {
}
file = new File(fileFullPath);
while (!file.createNewFile()) {
fileFullPath = String.format("%s/%s/%s-%s.udi", filePath, DateUtil.getDate(), fileDesc, IdUtil.fastSimpleUUID());
fileFullPath = String.format("%s/%s/%s-%s.udi", filePath, MsDateUtil.getDate(), fileDesc, IdUtil.fastSimpleUUID());
file = new File(fileFullPath);
}
@ -1148,7 +1146,7 @@ public class HeartService {
if (timeInfo == null) {
timeInfo = BasicExportStatusTimeEntity.builder()
.key(exportStatusTimeEnum.getKey())
.lastUpdateTime(DateUtil.formatDateTime(date))
.lastUpdateTime(MsDateUtil.formatDateTime(date))
.remark(exportStatusTimeEnum.getRemark())
.build();
basicExportTimeService.save(timeInfo);
@ -1157,7 +1155,7 @@ public class HeartService {
isNew = false;
}
basicExportTimeService.update(Wrappers.lambdaUpdate(BasicExportStatusTimeEntity.class)
.set(BasicExportStatusTimeEntity::getLastUpdateTime, DateUtil.formatDateTime(date))
.set(BasicExportStatusTimeEntity::getLastUpdateTime, MsDateUtil.formatDateTime(date))
.eq(BasicExportStatusTimeEntity::getKey, exportStatusTimeEnum.getKey())
);
}
@ -1202,7 +1200,7 @@ public class HeartService {
basicExportStatusEntity2 = busTypetatusEntity;
}
BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
basicExportStatusTimeEntity.setLastUpdateTime(MsDateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_BUS_TYPE);
spsSyncBusResponse.setTaskId(basicExportStatusEntity2.getId());
BaseResponse<String> baseResponse2 = spGetHttp.postAllBusType(spsSyncBusResponse);
@ -1263,7 +1261,7 @@ public class HeartService {
}
BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
basicExportStatusTimeEntity.setLastUpdateTime(MsDateUtil.formatDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_BASIC_DATA);
syncDataResponse.setTaskId(basicExportStatusEntity3.getId());
BaseResponse<String> baseResponse = spGetHttp.postAllUser(syncDataResponse);
@ -2047,7 +2045,7 @@ public class HeartService {
}
BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"));
basicExportStatusTimeEntity.setLastUpdateTime(MsDateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"));
basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_THR_DATA);
spsSyncThrDataResponse.setTaskId(basicExportStatusEntity1.getId());
BaseResponse<String> baseResponse = spGetHttp.postThrData(spsSyncThrDataResponse);
@ -2116,7 +2114,7 @@ public class HeartService {
}
BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"));
basicExportStatusTimeEntity.setLastUpdateTime(MsDateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"));
basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_SYS_SETTING);
spsSyncSysSettingResponse.setTaskId(basicExportStatusEntity1.getId());
spsSyncSysSettingResponse.setType(basicExportStatusEntity1.getType());
@ -2194,7 +2192,7 @@ public class HeartService {
}
BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
basicExportStatusTimeEntity.setLastUpdateTime(DateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"));
basicExportStatusTimeEntity.setLastUpdateTime(MsDateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"));
basicExportStatusTimeEntity.setKey(ConstantStatus.SYNC_THR_PRODUCTS);
spsSyncThrProductsResponse.setTaskId(basicExportStatusEntity1.getId());
BaseResponse<String> baseResponse = spGetHttp.postThrProducts(spsSyncThrProductsResponse);

35
src/main/java/com/glxp/api/service/sync/UpBasicService.java
Unescape Escape View File

@ -1,7 +1,6 @@
package com.glxp.api.service.sync;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.extension.service.IService;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.entity.auth.*;
import com.glxp.api.entity.basic.BasicBusTypeChangeEntity;
@ -28,7 +27,7 @@ import com.glxp.api.service.purchase.PurOrderDetailService;
import com.glxp.api.service.purchase.PurOrderService;
import com.glxp.api.service.system.*;
import com.glxp.api.service.thrsys.IThrBusTypeOriginService;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.MsDateUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@ -90,7 +89,7 @@ public class UpBasicService {
BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest);
if (CollUtil.isNotEmpty(syncDataSetEntity.getBusTypes())) {
for (SyncDataBustypeEntity syncDataBustypeEntity : syncDataSetEntity.getBusTypes()) {
List<IoOrderEntity> temps = orderService.findByStatus(syncDataBustypeEntity.getAction(), syncDataBustypeEntity.getOrderStatus(), DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<IoOrderEntity> temps = orderService.findByStatus(syncDataBustypeEntity.getAction(), syncDataBustypeEntity.getOrderStatus(), MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
if (CollUtil.isNotEmpty(temps)) {
orderEntities.addAll(temps);
}
@ -153,7 +152,7 @@ public class UpBasicService {
if (CollUtil.isNotEmpty(syncDataSetEntity.getChangeBusTypes())) {
for (SyncDataChangeBustypesEntity syncDataChangeBustypesEntity : syncDataSetEntity.getChangeBusTypes()) {
if (syncDataChangeBustypesEntity.getAction().equals(ConstantStatus.BUS_ORDER_CGDD)) {
List<PurOrderEntity> temps = purOrderService.findByStatus(syncDataChangeBustypesEntity.getAction(), syncDataChangeBustypesEntity.getOrderStatus(), DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<PurOrderEntity> temps = purOrderService.findByStatus(syncDataChangeBustypesEntity.getAction(), syncDataChangeBustypesEntity.getOrderStatus(), MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
if (CollUtil.isNotEmpty(temps)) {
purOrderEntities.addAll(temps);
}
@ -189,19 +188,19 @@ public class UpBasicService {
//扫码单据类型
if (syncDataSetEntity.getTypeScan() == 1) {
List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
spsSyncBusResponse.setBussinessTypeEntities(bussinessTypeEntities);
}
// 业务单据类型
if (syncDataSetEntity.getTypeBus() == 1) {
List<BasicBusTypeChangeEntity> basicBusTypeChangeEntities = basicBusTypeChangeService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<BasicBusTypeChangeEntity> basicBusTypeChangeEntities = basicBusTypeChangeService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
spsSyncBusResponse.setBusTypeChangeEntities(basicBusTypeChangeEntities);
}
//第三方单据类型
if (syncDataSetEntity.getTypeThird() == 1) {
List<ThrBusTypeOriginEntity> thrBusTypeOriginEntities = thrBusTypeOriginService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<ThrBusTypeOriginEntity> thrBusTypeOriginEntities = thrBusTypeOriginService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
spsSyncBusResponse.setThrBusTypeOriginEntities(thrBusTypeOriginEntities);
}
@ -251,7 +250,7 @@ public class UpBasicService {
if (syncDataSetEntity.getBasicInv() == 1) {
//仓库字典
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
syncDataResponse.setInvWarehouseEntities(invWarehouseEntities);
if (CollUtil.isNotEmpty(invWarehouseEntities)) {
@ -309,24 +308,24 @@ public class UpBasicService {
//系统运行参数
if (syncDataSet.getSystemConfig() == 1) {
List<SystemParamConfigEntity> systemParamConfigEntities = systemParamConfigService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<SystemParamConfigEntity> systemParamConfigEntities = systemParamConfigService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
spsSyncSysSettingResponse.setSystemParamConfigEntities(systemParamConfigEntities);
}
//委托验收设置
if (syncDataSet.getEntrustAction() == 1) {
List<EntrustReceEntity> entrustReceEntities = entrustReceService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<EntrustReceEntity> entrustReceEntities = entrustReceService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
spsSyncSysSettingResponse.setEntrustReceEntities(entrustReceEntities);
}
//打印设置
if (syncDataSet.getPrintConfig() == 1) {
List<SystemPDFModuleEntity> systemPDFModuleEntities = systemPDFModuleService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<SystemPDFTemplateEntity> systemPDFTemplateEntities = systemPDFTemplateService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<SysPdfTemplateRelevanceCodeEntity> sysPdfTemplateRelevanceCodeEntities = systemPDFTemplateRelevanceCodeService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<SysPdfTemplateRelevanceBizEntity> sysPdfTemplateRelevanceBizEntities = systemPDFTemplateRelevanceBizService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<SysPdfTemplateRelevanceLabelEntity> sysPdfTemplateRelevanceLabelEntities = systemPDFTemplateRelevanceLabelService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<SysPdfTemplateRelevanceStatemenEntity> sysPdfTemplateRelevanceStatemenEntities = systemPDFTemplateRelevanceStatemenService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<SystemPDFModuleEntity> systemPDFModuleEntities = systemPDFModuleService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<SystemPDFTemplateEntity> systemPDFTemplateEntities = systemPDFTemplateService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<SysPdfTemplateRelevanceCodeEntity> sysPdfTemplateRelevanceCodeEntities = systemPDFTemplateRelevanceCodeService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<SysPdfTemplateRelevanceBizEntity> sysPdfTemplateRelevanceBizEntities = systemPDFTemplateRelevanceBizService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<SysPdfTemplateRelevanceLabelEntity> sysPdfTemplateRelevanceLabelEntities = systemPDFTemplateRelevanceLabelService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<SysPdfTemplateRelevanceStatemenEntity> sysPdfTemplateRelevanceStatemenEntities = systemPDFTemplateRelevanceStatemenService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
spsSyncSysSettingResponse.setSystemPDFModuleEntities(systemPDFModuleEntities);
spsSyncSysSettingResponse.setSystemPDFTemplateEntities(systemPDFTemplateEntities);
@ -338,13 +337,13 @@ public class UpBasicService {
//自动建出入库单
if (syncDataSet.getScanChangeConfig() == 1) {
List<BasicBusTypePreEntity> basicBusTypePreEntities = basicBusTypePreService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<BasicBusTypePreEntity> basicBusTypePreEntities = basicBusTypePreService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
spsSyncSysSettingResponse.setBasicBusTypePreEntities(basicBusTypePreEntities);
}
//自动建业务单设置
if (syncDataSet.getBusChangeConfig() == 1) {
List<BasicBusTypeChangeEntity> basicBusTypeChangeEntities = basicBusTypeChangeService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<BasicBusTypeChangeEntity> basicBusTypeChangeEntities = basicBusTypeChangeService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
spsSyncSysSettingResponse.setBasicBusTypeChangeEntities(basicBusTypeChangeEntities);
}

10
src/main/java/com/glxp/api/service/sync/UpThrDataService.java
Unescape Escape View File

@ -12,7 +12,7 @@ import com.glxp.api.service.thrsys.ThrCorpService;
import com.glxp.api.service.thrsys.ThrDeptService;
import com.glxp.api.service.thrsys.ThrInvWarehouseService;
import com.glxp.api.service.thrsys.ThrProductsService;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.MsDateUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -48,19 +48,19 @@ public class UpThrDataService {
//第三方部门信息
if (syncDataSet.getBasicThirdDept() == 1) {
List<ThrDeptEntity> deptEntities = thrDeptService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<ThrDeptEntity> deptEntities = thrDeptService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
spsSyncThrDataResponse.setDeptEntities(deptEntities);
}
//第三方仓库信息
if (syncDataSet.getBasicThirdInv() == 1) {
List<ThrInvWarehouseEntity> invWarehouseEntities = thrInvWarehouseService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<ThrInvWarehouseEntity> invWarehouseEntities = thrInvWarehouseService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
spsSyncThrDataResponse.setInvWarehouseEntities(invWarehouseEntities);
}
//第三方往来单位信息
if (syncDataSet.getBasicThirdCorp() == 1) {
List<ThrCorpEntity> corpEntities = thrCorpService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<ThrCorpEntity> corpEntities = thrCorpService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
spsSyncThrDataResponse.setCorpEntities(corpEntities);
}
return spsSyncThrDataResponse;
@ -79,7 +79,7 @@ public class UpThrDataService {
//第三方产品信息
if (syncDataSet.getBasicThirdProducts() == 1) {
List<ThrProductsEntity> thrProductsEntities = thrProductsService.findByLastTime(DateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
List<ThrProductsEntity> thrProductsEntities = thrProductsService.findByLastTime(MsDateUtil.parseDate(spsSyncDataRequest.getLastUpdateTime()));
spsSyncThrProductsResponse.setProductsEntities(thrProductsEntities);
}

265
src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java
Unescape Escape View File

@ -58,6 +58,8 @@ public class ThrOrdersDlService {
SyncDataSetService syncDataSetService;
@Resource
HttpOkClient httpOkClient;
@Resource
private IThrBusTypeOriginService iThrBusTypeOriginService;
public String getIpUrl() {
SyncDataSetEntity syncDataSetEntity = syncDataSetService.findSet();
@ -69,22 +71,22 @@ public class ThrOrdersDlService {
ThrOrderImportLogEntity thrOrderImportLogEntity = thrOrderImportLogService.selectByGenKey(genKey);
//todo单据还没设计好
// BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(action, "orderQueryUrl");
// if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) {
// WebSocketServer.sendInfo("业务单据查询接口未设置！", "sid");
// return;
// }
ThrSystemDetailEntity thrSystemDetailEntity = new ThrSystemDetailEntity();
ThrSystemDetailEntity thrSystemDetailEntity = iThrBusTypeOriginService.findSysByAction(action, "orderQueryUrl");
if (thrSystemDetailEntity == null || !thrSystemDetailEntity.getEnabled()) {
WebSocketServer.sendInfo("业务单据查询接口未设置！", "sid");
return;
}
if (thrSystemDetailEntity.getThirdSysFk() == null) {
WebSocketServer.sendInfo("业务单据查询接口未设置！", "sid");
return;
}
int page = 1;
int limit = 100;
while (page != -1) {
page = getOrders(page, limit, thrSystemDetailEntity.getValue(), thrSystemDetailEntity.getThirdSysFk(), thrOrderImportLogEntity, action, filterThrProductsRequest);
page = getOrders(page, limit, thrSystemDetailEntity.getThirdSysFk(), thrOrderImportLogEntity, action, filterThrProductsRequest);
}
thrOrderImportLogService.importThrOrder(genKey);
redisUtil.set(Constant.dlThrProducts, "false");
WebSocketServer.sendInfo("业务单据信息下载已完成，请刷新查看！", "sid");
thrOrderImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
@ -96,20 +98,28 @@ public class ThrOrdersDlService {
ThrOrderImportLogEntity thrOrderImportLogEntity = thrOrderImportLogService.selectByGenKey(genKey);
if (erpOrderResponses != null && erpOrderResponses.size() > 0) {
for (ThrOrderResponse erpOrderResponse : erpOrderResponses) {
List<ThrOrderImportDetailEntity> thrOrderDetailEntities = new ArrayList<>();
ThrOrderEntity thrOrderEntity = new ThrOrderEntity();
BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity);
thrOrderEntity.setThirdSysFk(thirdSys);
ThrOrderEntity originEntity = thrOrderService.findByUnique(thrOrderEntity.getBillNo(), thrOrderEntity.getThirdSysFk());
if (originEntity != null) {
thrOrderService.deleteById(originEntity.getId() + "");
thrOrderDetailService.deleteByOrderIdFk(originEntity.getId() + "");
}
thrOrderService.insertThrOrder(thrOrderEntity);
List<ThrOrderDetailEntity> thrOrderDetailEntities = new ArrayList<>();
for (ThrOrderResponse.SubErpOrder subPurchase : erpOrderResponse.getSubErpOrders()) {
ThrOrderImportDetailEntity thrOrderDetailEntity = new ThrOrderImportDetailEntity();
ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity();
thrOrderDetailEntity.setUpdateTime(new Date());
BeanUtils.copyProperties(subPurchase, thrOrderDetailEntity);
BeanUtils.copyProperties(erpOrderResponse, thrOrderDetailEntity);
thrOrderDetailEntity.setGenKeyFk(thrOrderImportLogEntity.getGenKey());
thrOrderDetailEntity.setThirdSysFk(thirdSys);
thrOrderDetailEntity.setUpdateTime(new Date());
thrOrderDetailEntity.setOrderIdFk(thrOrderEntity.getBillNo());
thrOrderDetailEntities.add(thrOrderDetailEntity);
}
thrOrderImportDetailService.insertOrderImportDetails(thrOrderDetailEntities);
thrOrderDetailService.insertThrOrderDetails(thrOrderDetailEntities);
}
}
thrOrderImportLogService.importThrOrder(genKey);
redisUtil.set(Constant.dlThrProducts, "false");
WebSocketServer.sendInfo("业务单据信息下载已完成，请刷新查看！", "sid");
thrOrderImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
@ -216,209 +226,7 @@ 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 = httpOkClient.uCloudPost(getIpUrl() + "/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)) {
// return bussinessTypeEntity.getName();
// }
// }
// return action;
// }
//
@Async
public void uploadSmp(String genKey, ThrOrderExportRequest thrOrderExportRequest) {
@ -497,7 +305,7 @@ public class ThrOrdersDlService {
}
public int getOrders(int page, int limit, String orderUrl, String thirdSys, ThrOrderImportLogEntity
public int getOrders(int page, int limit, String thirdSys, ThrOrderImportLogEntity
thrOrderImportLogEntity, String action, FilterThrOrderRequest filterThrOrderRequest) {
if (filterThrOrderRequest == null)
filterThrOrderRequest = new FilterThrOrderRequest();
@ -513,21 +321,24 @@ public class ThrOrdersDlService {
for (ThrOrderResponse erpOrderResponse : erpOrderResponses) {
ThrOrderEntity thrOrderEntity = new ThrOrderEntity();
BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity);
thrOrderEntity.setThirdSysFk(thirdSys);
ThrOrderEntity originEntity = thrOrderService.findByUnique(thrOrderEntity.getBillNo(), thrOrderEntity.getThirdSysFk());
if (originEntity != null) {
thrOrderService.deleteById(originEntity.getId() + "");
thrOrderDetailService.deleteByOrderIdFk(originEntity.getId() + "");
}
thrOrderEntity.setUpdateTime(new Date());
thrOrderEntity.setThirdSysFk(thirdSys);
thrOrderService.insertThrOrder(thrOrderEntity);
// thrOrderEntity = thrOrderService.findByUnique(thrOrderEntity.getBillNo(), thrOrderEntity.getThirdSysFk());
List<ThrOrderImportDetailEntity> thrOrderDetailEntities = new ArrayList<>();
List<ThrOrderDetailEntity> thrOrderDetailEntities = new ArrayList<>();
for (ThrOrderResponse.SubErpOrder subPurchase : erpOrderResponse.getSubErpOrders()) {
ThrOrderImportDetailEntity thrOrderDetailEntity = new ThrOrderImportDetailEntity();
ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity();
BeanUtils.copyProperties(subPurchase, thrOrderDetailEntity);
BeanUtils.copyProperties(erpOrderResponse, thrOrderDetailEntity);
thrOrderDetailEntity.setGenKeyFk(thrOrderImportLogEntity.getGenKey());
thrOrderDetailEntity.setThirdSysFk(thirdSys);
thrOrderDetailEntity.setOrderIdFk(thrOrderEntity.getBillNo());
thrOrderDetailEntity.setUpdateTime(new Date());
thrOrderDetailEntities.add(thrOrderDetailEntity);
}
thrOrderImportDetailService.insertOrderImportDetails(thrOrderDetailEntities);
thrOrderDetailService.insertThrOrderDetails(thrOrderDetailEntities);
}
page++;
if (page * limit < responseBaseResponse.getData().getTotal()) {

26
src/main/java/com/glxp/api/service/thrsys/ThrUnitImportService.java
Unescape Escape View File

@ -1,8 +1,10 @@
package com.glxp.api.service.thrsys;
import cn.hutool.core.util.IdUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.entity.thrsys.ThrCorpEntity;
import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
import com.glxp.api.http.ErpBasicClient;
@ -42,7 +44,6 @@ public class ThrUnitImportService {
List<ThrCorpsResponse> imports = new ArrayList<>();
if (thrSystemDetailEntity.getFromType() == 0) {
int page = 1;
List<ThrCorpsResponse> erpUnitsResponses = new ArrayList<>();
while (true) {
unitMaintainFilterRequest.setPage(page);
@ -58,43 +59,33 @@ public class ThrUnitImportService {
erpUnitsResponses.addAll(temps);
}
}
imports.addAll(erpUnitsResponses);
} else {
FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();
BeanUtils.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest);
filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys());
filterThrCorpRequest.setPage(null);
List<ThrCorpsResponse> thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest);
// List<ThrCorpsResponse> lists = thrCorpEntities.stream().map(
// item -> {
// ThrCorpsResponse thrProductsEntity = new ThrCorpsResponse();
// BeanUtils.copyProperties(item, thrProductsEntity);
// thrProductsEntity.setId(item.getUnitId());
// return thrProductsEntity;
// }
// ).collect(Collectors.toList());
imports.addAll(thrCorpEntities);
}
if (imports != null && imports.size() > 0) {
for (ThrCorpsResponse erpUnitsResponse : imports) {
ThrUnitMaintainResponse thrUnitMaintainResponse = new ThrUnitMaintainResponse();
BasicCorpEntity thrUnitMaintainResponse = new BasicCorpEntity();
if (unitMaintainFilterRequest.getThirdSys() != null) {
if ("thirdId".equals(unitMaintainFilterRequest.getThirdSys())) {
thrUnitMaintainResponse.setThirdId(erpUnitsResponse.getId());
thrUnitMaintainResponse.setThirdId(erpUnitsResponse.getUnitId());
thrUnitMaintainResponse.setThirdName(erpUnitsResponse.getName());
} else if ("thirdId1".equals(unitMaintainFilterRequest.getThirdSys())) {
thrUnitMaintainResponse.setThirdId1(erpUnitsResponse.getId());
thrUnitMaintainResponse.setThirdId1(erpUnitsResponse.getUnitId());
thrUnitMaintainResponse.setThirdName1(erpUnitsResponse.getName());
} else if ("thirdId2".equals(unitMaintainFilterRequest.getThirdSys())) {
thrUnitMaintainResponse.setThirdId2(erpUnitsResponse.getId());
thrUnitMaintainResponse.setThirdId2(erpUnitsResponse.getUnitId());
thrUnitMaintainResponse.setThirdName2(erpUnitsResponse.getName());
} else if ("thirdId3".equals(unitMaintainFilterRequest.getThirdSys())) {
thrUnitMaintainResponse.setThirdId3(erpUnitsResponse.getId());
thrUnitMaintainResponse.setThirdId3(erpUnitsResponse.getUnitId());
thrUnitMaintainResponse.setThirdName3(erpUnitsResponse.getName());
} else if ("thirdId4".equals(unitMaintainFilterRequest.getThirdSys())) {
thrUnitMaintainResponse.setThirdId4(erpUnitsResponse.getId());
thrUnitMaintainResponse.setThirdId4(erpUnitsResponse.getUnitId());
thrUnitMaintainResponse.setThirdName4(erpUnitsResponse.getName());
}
}
@ -111,6 +102,7 @@ public class ThrUnitImportService {
thrUnitMaintainResponse.setContact(erpUnitsResponse.getContact());
thrUnitMaintainResponse.setMobile(erpUnitsResponse.getMobile());
thrUnitMaintainResponse.setUpdateTime(new Date());
thrUnitMaintainResponse.setId(IdUtil.getSnowflakeNextId());
basicCorpService.insertThrUnitMaintainignore(thrUnitMaintainResponse);
}
}

2
src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
Unescape Escape View File

@ -220,7 +220,7 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
@Override
public BaseResponse downloadByRequest(FilterThrProductsRequest filterThrProductsRequest) {
int page = 1;
int limit = 200;
int limit = 100;
filterThrProductsRequest.setThirdSysFk(filterThrProductsRequest.getThirdSys());
filterThrProductsRequest.setLimit(limit);
log.error("开始下载-------");

8
src/main/java/com/glxp/api/task/IoStatOrderTask.java
Unescape Escape View File

@ -11,7 +11,7 @@ import com.glxp.api.service.inout.IoStatDayService;
import com.glxp.api.service.inout.IoStatMonthService;
import com.glxp.api.service.inout.IoStatQuarterService;
import com.glxp.api.service.inout.IoStatYearService;
import com.glxp.api.util.DateUtil;
import com.glxp.api.util.MsDateUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.SchedulingConfigurer;
import org.springframework.scheduling.config.ScheduledTaskRegistrar;
@ -69,7 +69,7 @@ public class IoStatOrderTask implements SchedulingConfigurer {
}
Date today = today1;
//判断起始时间，设置生成递进顺序，保证日汇总数据优先生成，否则后续数据的源数据会发生缺失，导致计算错误
if (DateUtil.isYearStart(today)) {
if (MsDateUtil.isYearStart(today)) {
//年初第一天，依次生成 日 -> 月 -> 季度 -> 年度 汇总数据
ThreadUtil.execAsync(() -> {
log.info("开始生成每日物资出入库汇总数据");
@ -88,7 +88,7 @@ public class IoStatOrderTask implements SchedulingConfigurer {
statYearService.statData(today);
log.info("年度物资出入库汇总数据生成结束");
});
} else if (DateUtil.isQuarterStart(today)) {
} else if (MsDateUtil.isQuarterStart(today)) {
//季度第一天，依次生成 日 -> 月 -> 季度 汇总数据
ThreadUtil.execAsync(() -> {
log.info("开始生成每日物资出入库汇总数据");
@ -103,7 +103,7 @@ public class IoStatOrderTask implements SchedulingConfigurer {
statQuarterService.statData(today);
log.info("季度物资出入库汇总数据生成结束");
});
} else if (DateUtil.isMonthStart(today)) {
} else if (MsDateUtil.isMonthStart(today)) {
//月度第一天，依次生成 日 -> 月 汇总数据
ThreadUtil.execAsync(() -> {
log.info("开始生成每日物资出入库汇总数据");

4
src/main/java/com/glxp/api/task/SyncHeartTask.java
Unescape Escape View File

@ -21,8 +21,8 @@ import javax.annotation.Resource;
import java.util.Arrays;
//@Component
//@EnableScheduling
@Component
@EnableScheduling
public class SyncHeartTask implements SchedulingConfigurer {
final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class);

15
src/main/java/com/glxp/api/util/DateUtil.java → src/main/java/com/glxp/api/util/MsDateUtil.java
Unescape Escape View File

@ -15,7 +15,7 @@ import java.text.SimpleDateFormat;
import java.util.*;
@Slf4j
public class DateUtil extends DateUtils {
public class MsDateUtil extends DateUtils {
private static String[] parsePatterns = {
"yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM-dd HH", "yyyy-MM",
@ -69,7 +69,7 @@ public class DateUtil extends DateUtils {
public static String formateExpireTime(String str) {
try {
Date date = DateUtil.parseDate(str, "yyyyMMdd");
Date date = MsDateUtil.parseDate(str, "yyyyMMdd");
return formatDate(date, "yyyy-MM-dd");
} catch (ParseException e) {
e.printStackTrace();
@ -79,7 +79,7 @@ public class DateUtil extends DateUtils {
public static Long parseDateExpire(String str) {
try {
return DateUtil.parseDate(str, "yyyyMMdd").getTime();
return MsDateUtil.parseDate(str, "yyyyMMdd").getTime();
} catch (ParseException e) {
e.printStackTrace();
}
@ -102,6 +102,11 @@ public class DateUtil extends DateUtils {
return FastDateFormat.getInstance(pattern).format(new Date());
}
public static String getDiFormat(String originDate) {
Date date = parseDate(originDate);
return FastDateFormat.getInstance("yyMMdd").format(date);
}
/**
* 得到当前日期前后多少天，月，年的日期字符串
*
@ -564,7 +569,7 @@ public class DateUtil extends DateUtils {
public static String formatExpireTime(String str) {
try {
Date date = DateUtil.parseDate(str, "yyyyMMdd");
Date date = MsDateUtil.parseDate(str, "yyyyMMdd");
return formatDate(date, "yyyy-MM-dd");
} catch (ParseException e) {
e.printStackTrace();
@ -614,7 +619,7 @@ public class DateUtil extends DateUtils {
*/
public static boolean compareExpire(String expireDate, String time) {
if (StrUtil.isBlank(time)) {
time = DateUtil.getDate("yyMMdd");
time = MsDateUtil.getDate("yyMMdd");
}
long t1 = Long.parseLong(expireDate);

2
src/main/resources/application.yml
Unescape Escape View File

@ -1,6 +1,6 @@
spring:
profiles:
active: test
active: dev
jmx:
enabled: false
servlet:

14
src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml
Unescape Escape View File

@ -30,6 +30,12 @@
<if test="corpType != null">
AND corpType = #{corpType}
</if>
<if test="corpTypeList != null and corpTypeList.size() > 0">
AND corpType in
<foreach item="item" index="index" collection="corpTypeList" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="outType != null">
AND (outType <![CDATA[ <> ]]> #{outType} or outType is NULL)
</if>
@ -105,16 +111,16 @@
#{remark})
</insert>
<insert id="insertThrUnitMaintainignore" keyProperty="id"
parameterType="com.glxp.api.res.thrsys.ThrUnitMaintainResponse">
<insert id="insertThrUnitMaintainignore"
parameterType="com.glxp.api.entity.basic.BasicCorpEntity">
insert
ignore
INTO basic_corp
(thirdId, erpId, name, spell,
(id, thirdId, erpId, name, spell,
addr, status, type, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4,
thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType, outType, createUser,
createTime, updateUser, remark)
values (#{thirdId},
values (#{id}, #{thirdId},
#{erpId},
#{name},
#{spell},

2
src/main/resources/mybatis/mapper/basic/BasicProductCategoryMapper.xml
Unescape Escape View File

@ -20,7 +20,7 @@
</sql>
<select id="getTreeList" resultType="com.glxp.api.res.basic.BasicProductCategoryTypeResponse">
SELECT id, code, name as label, parentCode
SELECT id, code, name as label, parentCode,remark
FROM basic_product_category
ORDER BY id DESC
</select>

2
src/main/resources/mybatis/mapper/basic/BasicProductCategoryRelMapper.xml
Unescape Escape View File

@ -75,7 +75,7 @@
</if>
</where>
GROUP BY basic_product_category_rel.relId
</select>

1
src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -1556,6 +1556,7 @@
AND b1.cpmctymc like concat('%', #{productName}, '%')
</if>
</where>
order by b1.id desc
</select>

20
src/main/resources/mybatis/mapper/inout/UnitMaintainPlatformDao.xml
Unescape Escape View File

@ -91,9 +91,6 @@
<if test="unitId != null and unitId != ''">
AND unitId = #{unitId}
</if>
<if test="customerId != null and customerId != ''">
AND customerId = #{customerId}
</if>
<if test="platformId != null and platformId != ''">
AND platformId = #{platformId}
</if>
@ -109,15 +106,6 @@
<if test="invSubCode != null and invSubCode != ''">
AND invSubCode = #{invSubCode}
</if>
<if test="appid != null and appid != ''">
AND appid = #{appid}
</if>
<if test="apiKey != null and apiKey != ''">
AND apiKey = #{apiKey}
</if>
<if test="secretKey != null and secretKey != ''">
AND secretKey = #{secretKey}
</if>
</where>
</select>
@ -152,6 +140,7 @@
<select id="selectDelectList" resultType="com.glxp.api.res.inout.PlatformLinkResponse">
SELECT io.id,
io.unitId,
io.platformId,
io.invCode,
io.invName,
@ -160,7 +149,11 @@
io.targetAction,
io.targetName,
io.sourceAction,
io.appid,
io.apiKey,
io.secretKey,
b1.`name` as sourceName
FROM io_unit_maintain_platform io
LEFT JOIN basic_bussiness_type b1 ON b1.action = io.sourceAction
where io.platformId = #{platformId}
@ -183,6 +176,7 @@
a1.host
FROM io_unit_maintain_platform io
inner join auth_platform a1 on a1.id = io.platformId
where io.unitId = #{unitld}
where io.unitId = #{unitld} and io.sourceAction = #{sourceAction}
GROUP BY io.unitId
</select>
</mapper>

202
src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml
Unescape Escape View File

@ -2,45 +2,54 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.dao.purchase.PurApplyDao">
<select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurApplyRequest"
resultType="com.glxp.api.res.purchase.PurApplyResponse">
SELECT
pur_apply.*,
cb.employeeName createByName,
ab.employeeName auditByName,
auth_warehouse.`name` targetInvName,
auth_dept.`name` targetDeptName
FROM
pur_apply
LEFT JOIN auth_user cb ON pur_apply.createUser = cb.id
LEFT JOIN auth_user ab ON pur_apply.auditUser = ab.id
LEFT JOIN auth_warehouse ON pur_apply.targetInvCode = auth_warehouse.`code`
LEFT JOIN auth_dept ON auth_dept.`code` = pur_apply.targetDeptCode
SELECT pur_apply.*,
cb.employeeName createByName,
ab.employeeName auditByName,
auth_warehouse.`name` targetInvName,
auth_dept.`name` targetDeptName,
aw1.`name` invName,
ad1.`name` deptName
FROM pur_apply
LEFT JOIN auth_user cb ON pur_apply.createUser = cb.id
LEFT JOIN auth_user ab ON pur_apply.auditUser = ab.id
LEFT JOIN auth_warehouse ON pur_apply.targetInvCode = auth_warehouse.`code`
LEFT JOIN auth_dept ON auth_dept.`code` = pur_apply.targetDeptCode
LEFT JOIN auth_warehouse aw1 ON pur_apply.invCode = aw1.`code`
LEFT JOIN auth_dept ad1 ON ad1.`code` = pur_apply.deptCode
<where>
<if test="billNo != '' and billNo != null">
AND billNo = #{billNo}
</if>
<if test="startDate != null and startDate !=''">
<![CDATA[ and DATE_FORMAT(pur_apply.createTime,'%Y-%m-%d')>= #{startDate}]]>
<if test="startDate != null and startDate != ''">
<![CDATA[
and DATE_FORMAT(pur_apply.createTime, '%Y-%m-%d') >= #{startDate}
]]>
</if>
<if test="endDate != null and endDate !=''">
<![CDATA[ and DATE_FORMAT(pur_apply.createTime,'%Y-%m-%d') <= #{endDate}]]>
<if test="endDate != null and endDate != ''">
<![CDATA[
and DATE_FORMAT(pur_apply.createTime, '%Y-%m-%d') <= #{endDate}
]]>
</if>
<if test="startAuditDate != null and startAuditDate !=''">
<![CDATA[ and DATE_FORMAT(pur_apply.auditTime,'%Y-%m-%d')>= #{startAuditDate}]]>
<if test="startAuditDate != null and startAuditDate != ''">
<![CDATA[
and DATE_FORMAT(pur_apply.auditTime, '%Y-%m-%d') >= #{startAuditDate}
]]>
</if>
<if test="endAuditDate != null and endAuditDate !=''">
<![CDATA[ and DATE_FORMAT(pur_apply.auditTime,'%Y-%m-%d') <= #{endAuditDate}]]>
<if test="endAuditDate != null and endAuditDate != ''">
<![CDATA[
and DATE_FORMAT(pur_apply.auditTime, '%Y-%m-%d') <= #{endAuditDate}
]]>
</if>
<if test="status!=null and status!=10 and status!=11">
<if test="status != null and status != 10 and status != 11">
and pur_apply.status = #{status}
</if>
<if test="status ==10">
and ( pur_apply.status = 3 or pur_apply.status=2 or pur_apply.status=4)
<if test="status == 10">
and (pur_apply.status = 3 or pur_apply.status = 2 or pur_apply.status = 4)
</if>
<if test="status ==11">
and ( pur_apply.status = 1 or pur_apply.status=2 or pur_apply.status=4)
<if test="status == 11">
and (pur_apply.status = 1 or pur_apply.status = 2 or pur_apply.status = 4)
</if>
<if test="deptCode != '' and deptCode != null">
@ -69,8 +78,8 @@
</if>
</where>
<choose>
<when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
order by ${orderBy} ${sort}
<when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">
order by ${orderBy} ${sort}
</when>
<otherwise>
ORDER BY updateTime DESC
@ -81,75 +90,110 @@
<insert id="insert" keyProperty="id" keyColumn="id"
parameterType="com.glxp.api.entity.purchase.PurApplyEntity" useGeneratedKeys="true">
replace
INTO pur_apply
(
billNo,billDate,status,billType,remark,invCode,
deptCode,createUser,createTime,auditUser,auditTime,updateTime,updateUser ,auditRemark,
targetInvCode,targetDeptCode,planBillNo,generatePlan,emergency,arrivalTime
)
values (
#{billNo},
#{billDate},
#{status},
#{billType},
#{remark},
#{invCode},
#{deptCode},
#{createUser},
#{createTime},
#{auditUser},
#{auditTime},
#{updateTime},
#{updateUser},
#{auditRemark},
#{targetInvCode},
#{targetDeptCode},
#{planBillNo},#{generatePlan},
#{emergency},#{arrivalTime}
)
INTO pur_apply
(billNo, billDate, status, billType, remark, invCode,
deptCode, createUser, createTime, auditUser, auditTime, updateTime, updateUser, auditRemark,
targetInvCode, targetDeptCode, planBillNo, generatePlan, emergency, arrivalTime)
values (#{billNo},
#{billDate},
#{status},
#{billType},
#{remark},
#{invCode},
#{deptCode},
#{createUser},
#{createTime},
#{auditUser},
#{auditTime},
#{updateTime},
#{updateUser},
#{auditRemark},
#{targetInvCode},
#{targetDeptCode},
#{planBillNo}, #{generatePlan},
#{emergency}, #{arrivalTime})
</insert>
<delete id="deleteByIds" parameterType="java.util.List">
DELETE FROM pur_apply WHERE id in
DELETE
FROM pur_apply WHERE id in
<foreach collection="ids" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<delete id="deleteById" parameterType="long">
DELETE FROM pur_apply
DELETE
FROM pur_apply
WHERE id = #{id}
</delete>
<update id="update" parameterType="com.glxp.api.entity.purchase.PurApplyEntity">
UPDATE pur_apply
<trim prefix="set" suffixOverrides=",">
<if test="billNo != null">billNo=#{billNo},</if>
<if test="billDate != null">billDate=#{billDate},</if>
<if test="status != null">status=#{status},</if>
<if test="billType != null">billType=#{billType},</if>
<if test="remark != null">remark=#{remark},</if>
<if test="invCode != null">invCode=#{invCode},</if>
<if test="deptCode != null">deptCode=#{deptCode},</if>
<if test="auditUser != null">auditUser=#{auditUser},</if>
<if test="auditTime != null">auditTime=#{auditTime},</if>
<if test="createUser != null">createUser=#{createUser},</if>
<if test="createTime != null">createTime=#{createTime},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if>
<if test="updateUser != null">updateUser=#{updateUser},</if>
<if test="auditRemark != null">auditRemark=#{auditRemark},</if>
<if test="targetInvCode != null">targetInvCode=#{targetInvCode},</if>
<if test="targetDeptCode != null">targetDeptCode=#{targetDeptCode},</if>
<if test="planBillNo != null">planBillNo=#{planBillNo},</if>
<if test="generatePlan != null">generatePlan=#{generatePlan},</if>
<if test="emergency != null">emergency=#{emergency},</if>
<if test="arrivalTime != null">arrivalTime=#{arrivalTime},</if>
<if test="billNo != null">
billNo=#{billNo},
</if>
<if test="billDate != null">
billDate=#{billDate},
</if>
<if test="status != null">
status=#{status},
</if>
<if test="billType != null">
billType=#{billType},
</if>
<if test="remark != null">
remark=#{remark},
</if>
<if test="invCode != null">
invCode=#{invCode},
</if>
<if test="deptCode != null">
deptCode=#{deptCode},
</if>
<if test="auditUser != null">
auditUser=#{auditUser},
</if>
<if test="auditTime != null">
auditTime=#{auditTime},
</if>
<if test="createUser != null">
createUser=#{createUser},
</if>
<if test="createTime != null">
createTime=#{createTime},
</if>
<if test="updateTime != null">
updateTime=#{updateTime},
</if>
<if test="updateUser != null">
updateUser=#{updateUser},
</if>
<if test="auditRemark != null">
auditRemark=#{auditRemark},
</if>
<if test="targetInvCode != null">
targetInvCode=#{targetInvCode},
</if>
<if test="targetDeptCode != null">
targetDeptCode=#{targetDeptCode},
</if>
<if test="planBillNo != null">
planBillNo=#{planBillNo},
</if>
<if test="generatePlan != null">
generatePlan=#{generatePlan},
</if>
<if test="emergency != null">
emergency=#{emergency},
</if>
<if test="arrivalTime != null">
arrivalTime=#{arrivalTime},
</if>
</trim>
WHERE id = #{id}
</update>
</mapper>

2
src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml
Unescape Escape View File

@ -40,6 +40,7 @@
ab.employeeName auditUserName,
db.employeeName applyCreateBy,
auth_warehouse.NAME invName,
aw1.name applyInvName,
auth_dept.`name` deptName,
basic_corp.name supName
FROM pur_order
@ -49,6 +50,7 @@
LEFT JOIN auth_warehouse ON pur_order.invCode = auth_warehouse.`code`
LEFT JOIN auth_dept ON auth_dept.CODE = pur_order.deptCode
left join basic_corp on pur_order.supId = basic_corp.erpId
left join auth_warehouse aw1 on pur_order.applyInv = aw1.`code`
<where>
<if test="billNo != '' and billNo != null">
AND billNo = #{billNo}

142
src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml
Unescape Escape View File

@ -2,49 +2,57 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.dao.purchase.PurPlanDao">
<select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurPlanRequest"
resultType="com.glxp.api.res.purchase.PurPlanResponse">
SELECT
pur_plan.*,
cb.employeeName createUserName,
ab.employeeName auditUserName,
auth_warehouse.NAME invName,
auth_dept.`name` deptName
FROM
pur_plan
LEFT JOIN auth_user cb ON pur_plan.createUser = cb.id
LEFT JOIN auth_user ab ON pur_plan.auditUser = ab.id
LEFT JOIN auth_warehouse ON pur_plan.invCode = auth_warehouse.`code`
LEFT JOIN auth_dept ON auth_dept.CODE = pur_plan.deptCode
SELECT pur_plan.*,
cb.employeeName createUserName,
ab.employeeName auditUserName,
db.employeeName applyCreateBy,
auth_warehouse.NAME invName,
aw1.name applyInvName,
auth_dept.`name` deptName
FROM pur_plan
LEFT JOIN auth_user cb ON pur_plan.createUser = cb.id
LEFT JOIN auth_user ab ON pur_plan.auditUser = ab.id
LEFT JOIN auth_user db ON pur_plan.applyCreateUser = db.id
LEFT JOIN auth_warehouse ON pur_plan.invCode = auth_warehouse.`code`
LEFT JOIN auth_dept ON auth_dept.CODE = pur_plan.deptCode
left join auth_warehouse aw1 on pur_plan.applyInv = aw1.`code`
<where>
<if test="billNo != '' and billNo != null">
AND billNo = #{billNo}
</if>
<if test="startDate != null and startDate !=''">
<![CDATA[ and DATE_FORMAT(pur_plan.createTime,'%Y-%m-%d')>= #{startDate}]]>
<if test="startDate != null and startDate != ''">
<![CDATA[
and DATE_FORMAT(pur_plan.createTime, '%Y-%m-%d') >= #{startDate}
]]>
</if>
<if test="endDate != null and endDate !=''">
<![CDATA[ and DATE_FORMAT(pur_plan.createTime,'%Y-%m-%d') <= #{endDate}]]>
<if test="endDate != null and endDate != ''">
<![CDATA[
and DATE_FORMAT(pur_plan.createTime, '%Y-%m-%d') <= #{endDate}
]]>
</if>
<if test="startAuditDate != null and startAuditDate !=''">
<![CDATA[ and DATE_FORMAT(pur_plan.auditTime,'%Y-%m-%d')>= #{startAuditDate}]]>
<if test="startAuditDate != null and startAuditDate != ''">
<![CDATA[
and DATE_FORMAT(pur_plan.auditTime, '%Y-%m-%d') >= #{startAuditDate}
]]>
</if>
<if test="endAuditDate != null and endAuditDate !=''">
<![CDATA[ and DATE_FORMAT(pur_plan.auditTime,'%Y-%m-%d') <= #{endAuditDate}]]>
<if test="endAuditDate != null and endAuditDate != ''">
<![CDATA[
and DATE_FORMAT(pur_plan.auditTime, '%Y-%m-%d') <= #{endAuditDate}
]]>
</if>
<if test="status!=null and status!=10 and status!=11">
<if test="status != null and status != 10 and status != 11">
and pur_plan.status = #{status}
</if>
<if test="status ==10">
and ( pur_plan.status = 3 or pur_plan.status=2 or pur_plan.status=4)
<if test="status == 10">
and (pur_plan.status = 3 or pur_plan.status = 2 or pur_plan.status = 4)
</if>
<if test="status ==11">
and ( pur_plan.status = 1 or pur_plan.status=2 or pur_plan.status=4)
<if test="status == 11">
and (pur_plan.status = 1 or pur_plan.status = 2 or pur_plan.status = 4)
</if>
<if test="status ==12">
and (pur_plan.status=3)
<if test="status == 12">
and (pur_plan.status = 3)
</if>
<if test="deptCode != '' and deptCode != null">
AND deptCode = #{deptCode}
@ -63,8 +71,8 @@
</if>
</where>
<choose>
<when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
order by ${orderBy} ${sort}
<when test="(orderBy != null) and (sort == 'desc' or sort == 'asc')">
order by ${orderBy} ${sort}
</when>
<otherwise>
ORDER BY pur_plan.updateTime DESC
@ -72,80 +80,12 @@
</choose>
</select>
<insert id="insert" keyProperty="id"
parameterType="com.glxp.api.entity.purchase.PurPlanEntity" useGeneratedKeys="true">
replace
INTO pur_plan
(
billNo,billDate,status,billType,remark,invCode,
deptCode,createUser,createTime,auditUser,auditTime,updateTime,auditRemark
,applyCreateUser,applyAuditUser,applyRemark,applyBillNo,stockOrderNo,emergency,arrivalTime
)
values (
#{billNo},
#{billDate},
#{status},
#{billType},
#{remark},
#{invCode},
#{deptCode},
#{createUser},
#{createTime},
#{auditUser},
#{auditTime},
#{updateTime},
#{auditRemark},
#{applyCreateUser},
#{applyAuditUser},
#{applyRemark},
#{applyBillNo},
#{stockOrderNo},
#{emergency},#{arrivalTime}
)
</insert>
<delete id="deleteByIds" parameterType="java.util.List">
DELETE FROM pur_plan WHERE id in
DELETE
FROM pur_plan WHERE id in
<foreach collection="ids" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<update id="update" parameterType="com.glxp.api.entity.purchase.PurPlanEntity">
UPDATE pur_plan
<trim prefix="set" suffixOverrides=",">
<if test="billNo != null">billNo=#{billNo},</if>
<if test="billDate != null">billDate=#{billDate},</if>
<if test="status != null">status=#{status},</if>
<if test="billType != null">billType=#{billType},</if>
<if test="remark != null">remark=#{remark},</if>
<if test="invCode != null">invCode=#{invCode},</if>
<if test="deptCode != null">deptCode=#{deptCode},</if>
<if test="auditUser != null">auditUser=#{auditUser},</if>
<if test="auditTime != null">auditTime=#{auditTime},</if>
<if test="createUser != null">createUser=#{createUser},</if>
<if test="createTime != null">createTime=#{createTime},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if>
<if test="updateUser != null">updateUser=#{updateUser},</if>
<if test="auditRemark != null">auditRemark=#{auditRemark},</if>
<if test="applyCreateUser != null">applyCreateUser=#{applyCreateUser},</if>
<if test="applyAuditUser != null">applyAuditUser=#{applyAuditUser},</if>
<if test="applyRemark != null">applyRemark=#{applyRemark},</if>
<if test="applyBillNo != null">applyBillNo=#{applyBillNo},</if>
<if test="stockOrderNo != null">stockOrderNo=#{stockOrderNo},</if>
<if test="emergency != null">emergency=#{emergency},</if>
<if test="arrivalTime != null">arrivalTime=#{arrivalTime},</if>
</trim>
WHERE id = #{id}
</update>
<delete id="deleteById" parameterType="long">
DELETE FROM pur_plan
WHERE id = #{id}
</delete>
</mapper>

36
src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml
Unescape Escape View File

@ -6,7 +6,7 @@
resultType="com.glxp.api.entity.thrsys.ThrOrderEntity">
SELECT thr_order.*, thr_bustype_origin.name billTypeName
FROM thr_order
LEFT JOIN thr_bustype_origin ON thr_order.billType = thr_bustype_origin.action
LEFT JOIN thr_bustype_origin ON thr_order.billType = thr_bustype_origin.action
<where>
<if test="billNo != '' and billNo != null">
AND billNo = #{billNo}
@ -48,23 +48,20 @@
<insert id="insertThrOrder" keyProperty="id" parameterType="com.glxp.api.entity.thrsys.ThrOrderEntity">
replace
INTO thr_order
(id, billFlag, billNo, billdate, billType, billTypeName, corpId, corpName, inoutType, deptCode, deptName,
invCode, invName, thirdSysFk, createUser, createTime, updateUser, updateTime, reviewUser, reviewTime, address,
linkMan, linkTel, remark)
INTO thr_order
(id, billFlag, billNo, billdate, billType, corpId, corpName, inoutType, deptCode,
invCode, thirdSysFk, createUser, createTime, updateUser, updateTime, reviewUser, reviewTime, address,
linkMan, linkTel, remark)
values (#{id},
#{billFlag},
#{billNo},
#{billdate},
#{billType},
#{billTypeName},
#{corpId},
#{corpName},
#{inoutType},
#{deptCode},
#{deptName},
#{invCode},
#{invName},
#{thirdSysFk},
#{createUser},
#{createTime},
@ -80,23 +77,20 @@
<insert id="importThrOrder" keyProperty="id" parameterType="com.glxp.api.entity.thrsys.ThrOrderEntity">
replace
INTO thr_order
(id, billFlag, billNo, billdate, billType, billTypeName, corpId, corpName, inoutType, deptCode, deptName,
invCode, invName, thirdSysFk, createUser, createTime, updateUser, updateTime, reviewUser, reviewTime, address,
linkMan, linkTel, remark)
INTO thr_order
(id, billFlag, billNo, billdate, billType, corpId, corpName, inoutType, deptCode,
invCode, thirdSysFk, createUser, createTime, updateUser, updateTime, reviewUser, reviewTime, address,
linkMan, linkTel, remark)
values (#{id},
#{billFlag},
#{billNo},
#{billdate},
#{billType},
#{billTypeName},
#{corpId},
#{corpName},
#{inoutType},
#{deptCode},
#{deptName},
#{invCode},
#{invName},
#{thirdSysFk},
#{createUser},
#{createTime},
@ -112,24 +106,22 @@
<insert id="insertThrOrders" keyProperty="id" parameterType="java.util.List">
replace INTO thr_order
(billFlag, billNo, billdate, billType, billTypeName, corpId, corpName, inoutType, deptCode, deptName,
invCode, invName, thirdSysFk, createUser, createTime, updateUser, updateTime, reviewUser, reviewTime, address,
linkMan, linkTel, remark)
values
(billFlag, billNo, billdate, billType, corpId, corpName, inoutType, deptCode,
invCode, thirdSysFk, createUser, createTime, updateUser, updateTime, reviewUser, reviewTime,
address,
linkMan, linkTel, remark)
values
<foreach collection="thrOrderEntities" item="item" index="index"
separator=",">
(#{item.billFlag},
#{item.billNo},
#{item.billdate},
#{item.billType},
#{item.billTypeName},
#{item.corpId},
#{item.corpName},
#{item.inoutType},
#{item.deptCode},
#{item.deptName},
#{item.invCode},
#{item.invName},
#{item.thirdSysFk},
#{item.createUser},
#{item.createTime},

10
src/main/resources/schemas/schema_v2.1.sql
Unescape Escape View File

@ -134,6 +134,9 @@ CALL Pro_Temp_ColumnWork('pur_order', 'supId', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('pur_order', 'arrivalTime', 'datetime', 1);
CALL Pro_Temp_ColumnWork('pur_order', 'dealStatus', 'int', 1);
CALL Pro_Temp_ColumnWork('pur_plan', 'applyInv', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('pur_order', 'applyInv', 'varchar(255)', 1);
INSERT ignore INTO `auth_warehouse`(`id`, `code`, `name`, `parentId`, `remark`, `defaultInv`, `thirdId`, `thirdId1`,
`thirdId2`, `thirdId3`, `thirdId4`, `parentCode`, `advanceType`, `spUse`)
VALUES ('1541070754823692288', '1000000', '总库', '1000', '总111111', 0, '1001304', '402', NULL, NULL, NULL, '', 1, 1);
@ -358,6 +361,11 @@ CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_warehouse_user', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_space', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('pur_apply', 'billType', 'varchar(255)', 2);
CREATE TABLE IF NOT EXISTS `inv_place_order`
(
`id` int NOT NULL AUTO_INCREMENT,
@ -491,7 +499,7 @@ CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'topInvCode', 'varchar(255)',
CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'topInvSpaceCode', 'varchar(255)', 1);
call Modify_index('basic_products','uuid','idx_uuid','BTREE');
call Modify_index('basic_products', 'uuid', 'idx_uuid', 'BTREE');
CALL Pro_Temp_ColumnWork('basic_products', 'sfwblztlcp', 'varchar(255)', 1);

Write Preview
Loading…
Cancel
Save