代码合并

pro
anthonywj 2 years ago
commit eb3f48ce04

@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log; import com.glxp.api.annotation.Log;
import com.glxp.api.annotation.RepeatSubmit;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
@ -102,6 +103,7 @@ public class IoCodeTempController extends BaseController {
InvPreProductDetailService invPreProductDetailService; InvPreProductDetailService invPreProductDetailService;
//手持端扫码单据上传调用接口 //手持端扫码单据上传调用接口
@RepeatSubmit()
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("warehouse/inout/postOrders") @PostMapping("warehouse/inout/postOrders")
@Log(title = "单据管理", businessType = BusinessType.INSERT) @Log(title = "单据管理", businessType = BusinessType.INSERT)
@ -333,6 +335,7 @@ public class IoCodeTempController extends BaseController {
} }
//前端扫码提交 //前端扫码提交
@RepeatSubmit()
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("warehouse/inout/addOrderWeb") @PostMapping("warehouse/inout/addOrderWeb")
@Log(title = "单据管理", businessType = BusinessType.INSERT) @Log(title = "单据管理", businessType = BusinessType.INSERT)
@ -907,7 +910,9 @@ public class IoCodeTempController extends BaseController {
if (StrUtil.isEmpty(udiEntity.getExpireDate()) && !udiRelevanceResponse.getAllowNoExpire()) { if (StrUtil.isEmpty(udiEntity.getExpireDate()) && !udiRelevanceResponse.getAllowNoExpire()) {
errMsg = errMsg + ",失效日期"; errMsg = errMsg + ",失效日期";
} }
if (StrUtil.isEmpty(udiEntity.getSerialNo()) && !udiRelevanceResponse.getAllowNoSerial()) {
errMsg = errMsg + ",序列号";
}
if (StrUtil.isNotEmpty(errMsg)) { if (StrUtil.isNotEmpty(errMsg)) {
BaseResponse baseResponse = ResultVOUtils.error(507, "产品三期缺失请补齐" + errMsg.substring(1) + ""); BaseResponse baseResponse = ResultVOUtils.error(507, "产品三期缺失请补齐" + errMsg.substring(1) + "");
baseResponse.setData(udiEntity); baseResponse.setData(udiEntity);

@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log; import com.glxp.api.annotation.Log;
import com.glxp.api.annotation.RepeatSubmit;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
@ -193,6 +194,7 @@ public class IoOrderController extends BaseController {
//新增业务-立即提交 //新增业务-立即提交
@RepeatSubmit()
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("warehouse/inout/submitBiz") @PostMapping("warehouse/inout/submitBiz")
@Log(title = "单据管理", businessType = BusinessType.UPDATE) @Log(title = "单据管理", businessType = BusinessType.UPDATE)
@ -235,6 +237,7 @@ public class IoOrderController extends BaseController {
} }
//新增扫码单据-立即提交 //新增扫码单据-立即提交
@RepeatSubmit()
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("warehouse/inout/submitCodes") @PostMapping("warehouse/inout/submitCodes")
@Log(title = "单据管理", businessType = BusinessType.UPDATE) @Log(title = "单据管理", businessType = BusinessType.UPDATE)
@ -265,6 +268,7 @@ public class IoOrderController extends BaseController {
//新增业务单据,新增扫码单据,等待校验-草稿保存 //新增业务单据,新增扫码单据,等待校验-草稿保存
@RepeatSubmit()
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("warehouse/inout/saveOrderWeb") @PostMapping("warehouse/inout/saveOrderWeb")
@Log(title = "单据管理", businessType = BusinessType.UPDATE) @Log(title = "单据管理", businessType = BusinessType.UPDATE)
@ -312,6 +316,7 @@ public class IoOrderController extends BaseController {
} }
//等待校验-立即提交 //等待校验-立即提交
@RepeatSubmit()
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("warehouse/inout/submitOrderWeb") @PostMapping("warehouse/inout/submitOrderWeb")
@Log(title = "单据管理", businessType = BusinessType.UPDATE) @Log(title = "单据管理", businessType = BusinessType.UPDATE)
@ -373,6 +378,7 @@ public class IoOrderController extends BaseController {
} }
//带配货-立即提交 //带配货-立即提交
@RepeatSubmit()
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("warehouse/inout/waitAllocate/submitOrderWeb") @PostMapping("warehouse/inout/waitAllocate/submitOrderWeb")
@Log(title = "单据管理", businessType = BusinessType.UPDATE) @Log(title = "单据管理", businessType = BusinessType.UPDATE)
@ -477,6 +483,7 @@ public class IoOrderController extends BaseController {
} }
//已验收单据撤回 //已验收单据撤回
@RepeatSubmit()
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/udiwms/inout/order/received/rollback") @GetMapping("/udiwms/inout/order/received/rollback")
@Log(title = "单据管理", businessType = BusinessType.UPDATE) @Log(title = "单据管理", businessType = BusinessType.UPDATE)
@ -520,6 +527,7 @@ public class IoOrderController extends BaseController {
//已校验单据撤回到等待处理 //已校验单据撤回到等待处理
@RepeatSubmit()
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/udiwms/inout/order/unReceive/rollback") @GetMapping("/udiwms/inout/order/unReceive/rollback")
@Log(title = "单据管理", businessType = BusinessType.UPDATE) @Log(title = "单据管理", businessType = BusinessType.UPDATE)
@ -681,6 +689,7 @@ public class IoOrderController extends BaseController {
* @param billNo * @param billNo
* @return * @return
*/ */
@RepeatSubmit()
@GetMapping("/udiwms/inout/order/submitToThrSys") @GetMapping("/udiwms/inout/order/submitToThrSys")
public BaseResponse submitToThrSys(@RequestParam("billNo") String billNo) { public BaseResponse submitToThrSys(@RequestParam("billNo") String billNo) {
if (StrUtil.isBlank(billNo)) { if (StrUtil.isBlank(billNo)) {
@ -725,6 +734,7 @@ public class IoOrderController extends BaseController {
@Resource @Resource
InvWarehouseService invWarehouseService; InvWarehouseService invWarehouseService;
@RepeatSubmit()
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/order/change") @PostMapping("/udiwms/stock/order/change")
public BaseResponse stockOrderChange(@RequestBody AddOrderChangeRequest addOrderChangeRequest) { public BaseResponse stockOrderChange(@RequestBody AddOrderChangeRequest addOrderChangeRequest) {
@ -783,7 +793,6 @@ public class IoOrderController extends BaseController {
} }
originCodes.forEach( originCodes.forEach(
code -> { code -> {
//复制选中的产品 //复制选中的产品

@ -33,6 +33,7 @@ import com.glxp.api.req.inv.FilterInvoiceRequest;
import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.res.basic.UdiRlSupResponse;
import com.glxp.api.res.inout.IoOrderDetailBizResponse; import com.glxp.api.res.inout.IoOrderDetailBizResponse;
import com.glxp.api.res.inout.IoOrderDetailCodeResponse; import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
import com.glxp.api.res.inout.IoOrderInvoiceResponse; import com.glxp.api.res.inout.IoOrderInvoiceResponse;
@ -291,9 +292,9 @@ public class IoOrderDetailBizController extends BaseController {
for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
thrOrderDetailEntity.getProductId(); thrOrderDetailEntity.getProductId();
List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.selectListByThirdId(thrOrderDetailEntity.getProductId(), thrOrderEntity.getThirdSysFk()); List<UdiRlSupResponse> udiRelevanceEntities = udiRelevanceService.selectListByThirdId(thrOrderDetailEntity.getProductId(), thrOrderEntity.getThirdSysFk());
IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
UdiRelevanceResponse udiRelevanceResponse = null; UdiRlSupResponse udiRelevanceResponse = null;
if (udiRelevanceEntities.size() == 1) { if (udiRelevanceEntities.size() == 1) {
udiRelevanceResponse = udiRelevanceEntities.get(0); udiRelevanceResponse = udiRelevanceEntities.get(0);
ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getId()); ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getId());
@ -305,7 +306,8 @@ public class IoOrderDetailBizController extends BaseController {
ioOrderDetailBizEntity.setManufacturer(udiRelevanceResponse.getManufactory()); ioOrderDetailBizEntity.setManufacturer(udiRelevanceResponse.getManufactory());
ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname()); ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname());
ioOrderDetailBizEntity.setSpec(udiRelevanceResponse.getGgxh()); ioOrderDetailBizEntity.setSpec(udiRelevanceResponse.getGgxh());
ioOrderDetailBizEntity.setPrice(udiRelevanceResponse.getPrice()); ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(Double.valueOf(udiRelevanceResponse.getPrice())));
ioOrderDetailBizEntity.setSupId(udiRelevanceResponse.getCustomerId() + "");
} else { } else {
ioOrderDetailBizEntity.setCoName(thrOrderDetailEntity.getCorpName()); ioOrderDetailBizEntity.setCoName(thrOrderDetailEntity.getCorpName());
ioOrderDetailBizEntity.setCertCode(thrOrderDetailEntity.getZczbhhzbapzbh()); ioOrderDetailBizEntity.setCertCode(thrOrderDetailEntity.getZczbhhzbapzbh());
@ -316,7 +318,7 @@ public class IoOrderDetailBizController extends BaseController {
if (udiRelevanceEntities.size() > 1) { if (udiRelevanceEntities.size() > 1) {
String bindRlIds = ""; String bindRlIds = "";
for (UdiRelevanceResponse temp : udiRelevanceEntities) { for (UdiRlSupResponse temp : udiRelevanceEntities) {
bindRlIds = bindRlIds + "," + temp.getId(); bindRlIds = bindRlIds + "," + temp.getId();
} }
ioOrderDetailBizEntity.setBindRlIds(bindRlIds.substring(1)); ioOrderDetailBizEntity.setBindRlIds(bindRlIds.substring(1));

@ -0,0 +1,9 @@
package com.glxp.api.dao.thrsys;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.thrsys.ThrOrderUploadBustypesEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface ThrOrderUploadBustypesMapper extends BaseMapper<ThrOrderUploadBustypesEntity> {
}

@ -4,62 +4,67 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import lombok.Data;
/**
* <p>
*
* </p>
*
* @author
* @since 2023-01-13
*/
@Data @Data
@TableName("thr_order_upload_bustypes") @TableName(value = "thr_order_upload_bustypes")
public class ThrOrderUploadBustypesEntity { public class ThrOrderUploadBustypesEntity implements Serializable {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.INPUT)
private Integer id; private Integer id;
@TableField("action") @TableField(value = "`action`")
private String action; private String action;
@TableField("name") @TableField(value = "`name`")
private String name; private String name;
/**
* : 1:;2:;3:
*/
@TableField(value = "orderStatus")
private Integer orderStatus;
/**
* ()
*/
@TableField(value = "orderSource", typeHandler = FastjsonTypeHandler.class)
private String orderSource;
/** /**
* *
*/ */
@TableField("createUser") @TableField(value = "`createUser`")
private String createUser; private String createUser;
/** /**
* *
*/ */
@TableField("createTime") @TableField(value = "createTime")
private Date createTime; private Date createTime;
/** /**
* *
*/ */
@TableField("updateUser") @TableField(value = "updateUser")
private String updateUser; private String updateUser;
/** /**
* *
*/ */
@TableField("updateTime") @TableField(value = "updateTime")
private Date updateTime; private Date updateTime;
/** /**
* *
*/ */
@TableField("remark") @TableField(value = "remark")
private String remark; private String remark;
private static final long serialVersionUID = 1L;
} }

@ -154,7 +154,6 @@ public class ErpBasicClient {
/** /**
* *
* *
* @param files
* @param thirdSys * @param thirdSys
* @return * @return
*/ */

@ -35,7 +35,6 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
private String thrPiId; private String thrPiId;
private Boolean isCheck; private Boolean isCheck;
private Integer filterType; //0:全部1.对照完成2.未对照DI3.未对照产品编码4.未对照其他产品编码 private Integer filterType; //0:全部1.对照完成2.未对照DI3.未对照产品编码4.未对照其他产品编码
@ -52,5 +51,6 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
private String corpId; private String corpId;
private String billType; private String billType;
private String flbm;
private List<String> uuids; private List<String> uuids;
} }

@ -13,4 +13,5 @@ public class FilterCompanyProductRelevanceRequest extends ListPageRequest {
private String unitFk; private String unitFk;
private String lastUpdateTime; private String lastUpdateTime;
private String key; private String key;
private String flbm;
} }

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity;
import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.basic.FilterUdiRelRequest;
import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.res.basic.UdiRlSupResponse;
import java.util.List; import java.util.List;
@ -71,7 +72,7 @@ public interface UdiRelevanceService extends IService<UdiRelevanceEntity> {
UdiRelevanceEntity selectByThirdId(String thirdId, String thirdSys); UdiRelevanceEntity selectByThirdId(String thirdId, String thirdSys);
List<UdiRelevanceResponse> selectListByThirdId(String thirdId, String thirdSys); List<UdiRlSupResponse> selectListByThirdId(String thirdId, String thirdSys);
boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity);

@ -9,9 +9,12 @@ import com.glxp.api.dao.basic.UdiRelevanceDao;
import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity;
import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity;
import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.basic.FilterUdiRelRequest;
import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.res.basic.UdiRlSupResponse;
import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.basic.UdiRelevanceService;
import com.glxp.api.service.basic.UdiRlSupService;
import com.glxp.api.service.thrsys.ThrSystemService; import com.glxp.api.service.thrsys.ThrSystemService;
import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.FilterUdiUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -27,6 +30,8 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
@Resource @Resource
UdiRelevanceDao udiRelevanceDao; UdiRelevanceDao udiRelevanceDao;
@Resource @Resource
UdiRlSupService udiRlSupService;
@Resource
ThrSystemService basicThirdSysService; ThrSystemService basicThirdSysService;
@Override @Override
@ -320,12 +325,12 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
} }
@Override @Override
public List<UdiRelevanceResponse> selectListByThirdId(String thirdId, String thirdSys) { public List<UdiRlSupResponse> selectListByThirdId(String thirdId, String thirdSys) {
if (StrUtil.isEmpty(thirdId) || StrUtil.isEmpty(thirdSys)) { if (StrUtil.isEmpty(thirdId) || StrUtil.isEmpty(thirdSys)) {
return null; return null;
} }
FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); CompanyProductRelevanceRequest filterUdiRelRequest = new CompanyProductRelevanceRequest();
if ("thirdId".equals(thirdSys)) { if ("thirdId".equals(thirdSys)) {
filterUdiRelRequest.setThirdId(thirdId); filterUdiRelRequest.setThirdId(thirdId);
} else if ("thirdId1".equals(thirdSys)) { } else if ("thirdId1".equals(thirdSys)) {
@ -337,7 +342,8 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
} else if ("thirdId4".equals(thirdSys)) { } else if ("thirdId4".equals(thirdSys)) {
filterUdiRelRequest.setThirdId4(thirdId); filterUdiRelRequest.setThirdId4(thirdId);
} }
List<UdiRelevanceResponse> data = udiRelevanceDao.filterUdiGp(filterUdiRelRequest); filterUdiRelRequest.setDiType(1);
List<UdiRlSupResponse> data = udiRlSupService.filterUdiGp(filterUdiRelRequest);
return data; return data;
} }

@ -96,7 +96,7 @@ public class IoStatDayServiceImpl implements IoStatDayService {
ew.eq("month", twoDay.monthBaseOne()); ew.eq("month", twoDay.monthBaseOne());
ew.eq("day", twoDay.dayOfMonth()); ew.eq("day", twoDay.dayOfMonth());
List<IoStatDayEntity> ioStatDayEntityList=statDayDao.selectList(ew); List<IoStatDayEntity> ioStatDayEntityList=statDayDao.selectList(ew);
List<IoStatDayEntity> newOrOldDate=getNewOrOldDate(dataList,ioStatDayEntityList); List<IoStatDayEntity> newOrOldDate=getNewOrOldDate(dataList,ioStatDayEntityList,yesterday);
dataList.addAll(newOrOldDate); dataList.addAll(newOrOldDate);
//插入汇总记录 //插入汇总记录
saveData(yesterday, dataList); saveData(yesterday, dataList);
@ -239,7 +239,7 @@ public class IoStatDayServiceImpl implements IoStatDayService {
return wrapper; return wrapper;
} }
private List<IoStatDayEntity> getNewOrOldDate(List<IoStatDayEntity> newIoStatDayEntity, List<IoStatDayEntity> oldIoStatDayEntity){ private List<IoStatDayEntity> getNewOrOldDate(List<IoStatDayEntity> newIoStatDayEntity, List<IoStatDayEntity> oldIoStatDayEntity,DateTime yesterday){
// 计算出两个集合之间产品批次号组成的差异 // 计算出两个集合之间产品批次号组成的差异
List<IoStatDayEntity> IoStatDayEntityList = oldIoStatDayEntity.stream() List<IoStatDayEntity> IoStatDayEntityList = oldIoStatDayEntity.stream()
@ -252,10 +252,12 @@ public class IoStatDayServiceImpl implements IoStatDayService {
}).collect(Collectors.toList()); }).collect(Collectors.toList());
for (IoStatDayEntity ioStatDayEntity : IoStatDayEntityList) { for (IoStatDayEntity ioStatDayEntity : IoStatDayEntityList) {
DateTime twoDay = DateUtil.offsetDay(new Date(), -2);
ioStatDayEntity.setId(null); ioStatDayEntity.setId(null);
ioStatDayEntity.setBeginCount(ioStatDayEntity.getBalanceCount()); ioStatDayEntity.setBeginCount(ioStatDayEntity.getBalanceCount());
ioStatDayEntity.setBalanceAmount(ioStatDayEntity.getBalanceAmount()); ioStatDayEntity.setBalanceAmount(ioStatDayEntity.getBalanceAmount());
ioStatDayEntity.setBeginPrice(ioStatDayEntity.getBalancePrice()); ioStatDayEntity.setBeginPrice(ioStatDayEntity.getBalancePrice());
ioStatDayEntity.setDay(yesterday.dayOfMonth());
ioStatDayEntity.setInCount(0); ioStatDayEntity.setInCount(0);
ioStatDayEntity.setOutCount(0); ioStatDayEntity.setOutCount(0);
} }

@ -101,7 +101,7 @@ public class IoStatMonthServiceImpl implements IoStatMonthService {
ew.eq("quarter", twoDay.quarter()); ew.eq("quarter", twoDay.quarter());
ew.eq("month", twoDay.monthBaseOne()-2); ew.eq("month", twoDay.monthBaseOne()-2);
List<IoStatMonthEntity> ioStatMonthEntityList=statMonthDao.selectList(ew); List<IoStatMonthEntity> ioStatMonthEntityList=statMonthDao.selectList(ew);
List<IoStatMonthEntity> newOrOldDate=getNewOrOldDate(dataList,ioStatMonthEntityList); List<IoStatMonthEntity> newOrOldDate=getNewOrOldDate(dataList,ioStatMonthEntityList,lastMonth);
dataList.addAll(newOrOldDate); dataList.addAll(newOrOldDate);
//插入汇总记录 //插入汇总记录
@ -257,7 +257,7 @@ public class IoStatMonthServiceImpl implements IoStatMonthService {
return wrapper; return wrapper;
} }
private List<IoStatMonthEntity> getNewOrOldDate(List<IoStatMonthEntity> newIoStatDayEntity, List<IoStatMonthEntity> oldIoStatDayEntity) { private List<IoStatMonthEntity> getNewOrOldDate(List<IoStatMonthEntity> newIoStatDayEntity, List<IoStatMonthEntity> oldIoStatDayEntity, DateTime lastMonth) {
// 计算出两个集合之间产品批次号组成的差异 // 计算出两个集合之间产品批次号组成的差异
// List<IoStatMonthEntity> ioStatMonthEntityList = oldIoStatDayEntity.stream().filter(notComment -> { // List<IoStatMonthEntity> ioStatMonthEntityList = oldIoStatDayEntity.stream().filter(notComment -> {
@ -278,6 +278,7 @@ public class IoStatMonthServiceImpl implements IoStatMonthService {
for (IoStatMonthEntity ioStatDayEntity : ioStatMonthEntityList) { for (IoStatMonthEntity ioStatDayEntity : ioStatMonthEntityList) {
ioStatDayEntity.setId(null); ioStatDayEntity.setId(null);
ioStatDayEntity.setBeginCount(ioStatDayEntity.getBalanceCount()); ioStatDayEntity.setBeginCount(ioStatDayEntity.getBalanceCount());
ioStatDayEntity.setMonth(lastMonth.monthBaseOne());
ioStatDayEntity.setBalanceAmount(ioStatDayEntity.getBalanceAmount()); ioStatDayEntity.setBalanceAmount(ioStatDayEntity.getBalanceAmount());
ioStatDayEntity.setBeginPrice(ioStatDayEntity.getBalancePrice()); ioStatDayEntity.setBeginPrice(ioStatDayEntity.getBalancePrice());
ioStatDayEntity.setInCount(0); ioStatDayEntity.setInCount(0);

@ -1327,7 +1327,6 @@ public class HeartService {
}); });
if (response.getCode() == 20000 && response.getData() != null) { if (response.getCode() == 20000 && response.getData() != null) {
JSONArray fileJson = JSONUtil.parseObj(response.getData()).getJSONArray("syncFiles"); JSONArray fileJson = JSONUtil.parseObj(response.getData()).getJSONArray("syncFiles");
SpsSyncOrderResponse syncDataResponse = JSONObject.parseObject(response.getData(), new TypeReference<SpsSyncOrderResponse>() { SpsSyncOrderResponse syncDataResponse = JSONObject.parseObject(response.getData(), new TypeReference<SpsSyncOrderResponse>() {
}); });
@ -1342,9 +1341,7 @@ public class HeartService {
basicDownloadStatusEntity.setRemark(syncDataResponse.getSyncRemark()); basicDownloadStatusEntity.setRemark(syncDataResponse.getSyncRemark());
basicDownloadStatusEntity.setScheduleType(1); basicDownloadStatusEntity.setScheduleType(1);
basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity);
if (CollUtil.isNotEmpty(syncDataResponse.getOrderEntities())) { if (CollUtil.isNotEmpty(syncDataResponse.getOrderEntities())) {
try {
List<IoOrderEntity> orderEntities = syncDataResponse.getOrderEntities(); List<IoOrderEntity> orderEntities = syncDataResponse.getOrderEntities();
for (IoOrderEntity orderEntity : orderEntities) { for (IoOrderEntity orderEntity : orderEntities) {
SyncDataBustypeEntity syncDataBustypeEntity = syncDataBustypeService.findByAction(orderEntity.getAction(), 2); SyncDataBustypeEntity syncDataBustypeEntity = syncDataBustypeService.findByAction(orderEntity.getAction(), 2);
@ -1385,11 +1382,6 @@ public class HeartService {
idcService.batchDownloadFile(spGetHttp.getIpUrl(), syncFiles.toArray(new String[syncFiles.size()])); idcService.batchDownloadFile(spGetHttp.getIpUrl(), syncFiles.toArray(new String[syncFiles.size()]));
} }
} }
} catch (Exception e) {
e.printStackTrace();
}
} }
spGetHttp.finishTask(basicExportStatusEntity.getId()); spGetHttp.finishTask(basicExportStatusEntity.getId());
basicDownloadStatusEntity.setUpdateTime(new Date()); basicDownloadStatusEntity.setUpdateTime(new Date());
@ -1867,7 +1859,7 @@ public class HeartService {
List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities(); List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities();
for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) { for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) { if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
orderInvoiceService.insertInvoice(orderInvoiceEntity); ioOrderInvoiceMapper.insertOrUpdate(orderInvoiceEntity);
} }
} }
} }

@ -0,0 +1,10 @@
package com.glxp.api.service.thrsys;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.glxp.api.dao.thrsys.ThrOrderUploadBustypesMapper;
import com.glxp.api.entity.thrsys.ThrOrderUploadBustypesEntity;
@Service
public class ThrOrderUploadBustypesService extends ServiceImpl<ThrOrderUploadBustypesMapper, ThrOrderUploadBustypesEntity> {
}

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

@ -215,6 +215,10 @@
<if test="isDisable == false"> <if test="isDisable == false">
AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false) AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false)
</if> </if>
<if test="flbm != '' and flbm != null">
and (tp.flbm = #{flbm} or basic_products.flbm = #{flbm})
</if>
</where> </where>
ORDER BY company_product_relevance.updateTime DESC ORDER BY company_product_relevance.updateTime DESC
</select> </select>

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.thrsys.ThrOrderUploadBustypesMapper">
</mapper>
Loading…
Cancel
Save