diff --git a/src/main/java/com/glxp/mipsdl/client/phxyy/PhxyyClient.java b/src/main/java/com/glxp/mipsdl/client/phxyy/PhxyyClient.java index 89de72a..a7756eb 100644 --- a/src/main/java/com/glxp/mipsdl/client/phxyy/PhxyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/phxyy/PhxyyClient.java @@ -20,19 +20,13 @@ import com.glxp.mipsdl.dao.basic.BasicUdirelDao; import com.glxp.mipsdl.dao.inout.IoCodeDao; import com.glxp.mipsdl.dao.inout.IoOrderDao; import com.glxp.mipsdl.dao.inout.IoOrderDetailBizDao; -import com.glxp.mipsdl.dao.thrsys.ThrBustypeOriginDao; -import com.glxp.mipsdl.dao.thrsys.ThrInvWarehouseDao; -import com.glxp.mipsdl.dao.thrsys.ThrProductsDao; -import com.glxp.mipsdl.dao.thrsys.ThrSystemBusApiDao; +import com.glxp.mipsdl.dao.thrsys.*; import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity; import com.glxp.mipsdl.entity.basic.BasicBussinessTypeEntity; import com.glxp.mipsdl.entity.basic.BasicCorpEntity; import com.glxp.mipsdl.entity.basic.BasicUdirelEntity; import com.glxp.mipsdl.entity.inout.*; -import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity; -import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity; -import com.glxp.mipsdl.entity.thrsys.ThrProductsEntity; -import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity; +import com.glxp.mipsdl.entity.thrsys.*; import com.glxp.mipsdl.http.HttpClient; import com.glxp.mipsdl.req.base.*; import com.glxp.mipsdl.req.phxyy.PhBusTypeRequest; @@ -102,6 +96,8 @@ public class PhxyyClient implements BaseHttpClient { ThrProductsDao thrProductsDao; @Resource private OrderUploadLogService orderUploadLogService; + @Resource + private ThrOrderUploadBustypesMapper thrOrderUploadBustypesMapper; @Override public BaseResponse getUnit(UdiwmsUnitRequest udiwmsUnitRequest) { @@ -272,12 +268,12 @@ public class PhxyyClient implements BaseHttpClient { for (IoOrderDetailBizEntity stockOrderDetailEntity : stockOrderDetailEntities) { BasicUdirelEntity udiRelevanceEntity = basicUdirelDao.selectById(stockOrderDetailEntity.getBindRlFk()); - if (StrUtil.isNotEmpty(udiRelevanceEntity.getMainId())) { - ThrProductsEntity thrProductsEntity = thrProductsDao.selectOne(new QueryWrapper().eq("code", udiRelevanceEntity.getMainId()).last("limit 1")); - if (thrProductsEntity != null && StrUtil.isNotEmpty(thrProductsEntity.getRegisterNo())) { - stockOrderDetailEntity.setCertCode(thrProductsEntity.getRegisterNo()); - } - } +// if (StrUtil.isNotEmpty(udiRelevanceEntity.getMainId())) { +// ThrProductsEntity thrProductsEntity = thrProductsDao.selectOne(new QueryWrapper().eq("code", udiRelevanceEntity.getMainId()).last("limit 1")); +// if (thrProductsEntity != null && StrUtil.isNotEmpty(thrProductsEntity.getRegisterNo())) { +// stockOrderDetailEntity.setCertCode(thrProductsEntity.getRegisterNo()); +// } +// } UdiwmsOrderDetailRequest item = new UdiwmsOrderDetailRequest(); BeanUtil.copyProperties(stockOrderDetailEntity, item); item.setManufactory(stockOrderDetailEntity.getManufacturer()); @@ -316,21 +312,21 @@ public class PhxyyClient implements BaseHttpClient { item.setFirstSalesInvNo(fphm); item.setInvoiceDate(fprq); - - if (basicBussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT) && StrUtil.isEmpty(fphm)) { - uploadLog.setStatus(3); + boolean isNeedFp = false; + ThrOrderUploadBustypesEntity thrOrderUploadBustypesEntity = thrOrderUploadBustypesMapper.selectOne(new QueryWrapper().eq("action", basicBussinessTypeEntity.getAction()).last("limit 1")); + if (thrOrderUploadBustypesEntity != null && IntUtil.value(thrOrderUploadBustypesEntity.getOrderStatus()) == 3) { + isNeedFp = true; + } + if (basicBussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT) && StrUtil.isEmpty(fphm) && isNeedFp) { String errMsg = "提交失败，错误信息：" + stockOrderDetailEntity.getCoName() + "发票缺失,请补齐后重新提交"; - uploadLog.setResult(errMsg); - orderUploadLogService.insertOrUpdate(uploadLog); + orderUploadLogService.updateLocalErr(orderEntity, errMsg); return ResultVOUtils.error(500, errMsg); } ThrProductsEntity thrProductsEntity = thrProductsDao.selectOne(new QueryWrapper().eq("code", udiRelevanceEntity.getMainId()).last("limit 1")); if (StrUtil.isEmpty(udiRelevanceEntity.getMainId()) || thrProductsEntity == null || StrUtil.isEmpty(thrProductsEntity.getCode())) { - uploadLog.setStatus(3); String errMsg = "提交失败，错误信息：" + "产品DI未关联第三方产品信息"; - uploadLog.setResult(errMsg); - orderUploadLogService.insertOrUpdate(uploadLog); + orderUploadLogService.updateLocalErr(orderEntity, errMsg); return ResultVOUtils.error(500, errMsg); } else { item.setProductId(thrProductsEntity.getCode()); diff --git a/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java b/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java index 4d7b2b0..edccfd8 100644 --- a/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java @@ -343,14 +343,12 @@ public class PtxhyyClient extends CommonHttpClient { public String getUserName(IoOrderEntity orderEntity) { //创建人非供应商 - if (StrUtil.isNotEmpty(orderEntity.getReviewUser())) { - AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getReviewUser()); - return authUserEntity.getUserName(); - } else if (StrUtil.isNotEmpty(orderEntity.getUpdateUser()) && orderEntity.getUpdateUser().length() != 14) { - AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getUpdateUser()); + + if (StrUtil.isNotEmpty(orderEntity.getConfirmUser())) { + AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getConfirmUser()); return authUserEntity.getUserName(); - } else if (StrUtil.isNotEmpty(orderEntity.getCreateUser()) && orderEntity.getCreateUser().length() != 14) { - AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getCreateUser()); + } else if (StrUtil.isNotEmpty(orderEntity.getReviewUser())) { + AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getReviewUser()); return authUserEntity.getUserName(); } else { List authWarehouseUsers = authWarehouseUserMapper.selectList(new QueryWrapper().eq("code", orderEntity.getInvCode())); diff --git a/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrOrderUploadBustypesMapper.java b/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrOrderUploadBustypesMapper.java new file mode 100644 index 0000000..da43fd4 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/dao/thrsys/ThrOrderUploadBustypesMapper.java @@ -0,0 +1,9 @@ +package com.glxp.mipsdl.dao.thrsys; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.mipsdl.entity.thrsys.ThrOrderUploadBustypesEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ThrOrderUploadBustypesMapper extends BaseMapper { +} diff --git a/src/main/java/com/glxp/mipsdl/entity/inout/IoOrderEntity.java b/src/main/java/com/glxp/mipsdl/entity/inout/IoOrderEntity.java index d8f69fa..697ce1f 100644 --- a/src/main/java/com/glxp/mipsdl/entity/inout/IoOrderEntity.java +++ b/src/main/java/com/glxp/mipsdl/entity/inout/IoOrderEntity.java @@ -266,4 +266,8 @@ public class IoOrderEntity { private String preCurSpaceCode; + @TableField(value = "confirmUser") + private String confirmUser; + + } diff --git a/src/main/java/com/glxp/mipsdl/entity/thrsys/ThrOrderUploadBustypesEntity.java b/src/main/java/com/glxp/mipsdl/entity/thrsys/ThrOrderUploadBustypesEntity.java new file mode 100644 index 0000000..27950a4 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/entity/thrsys/ThrOrderUploadBustypesEntity.java @@ -0,0 +1,79 @@ +package com.glxp.mipsdl.entity.thrsys; + +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 com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +@Data +@TableName(value = "thr_order_upload_bustypes", autoResultMap = true) +public class ThrOrderUploadBustypesEntity implements Serializable { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @TableField(value = "`action`") + private String action; + + @TableField(value = "`name`") + private String name; + + /** + * 单据类型状态: 1:未审核;2:已审核;3:已确认 + */ + @TableField(value = "orderStatus") + private Integer orderStatus; + + /** + * 单据来源(数组) + */ + @TableField(value = "orderSource", typeHandler = JacksonTypeHandler.class) + private List orderSource; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 单据上传起始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @TableField(value = "`orderStartTime`") + private Date orderStartTime; + + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/mipsdl/res/udiwms/UdiwmsOrderResponse.java b/src/main/java/com/glxp/mipsdl/res/udiwms/UdiwmsOrderResponse.java index ffbc880..a794aa0 100644 --- a/src/main/java/com/glxp/mipsdl/res/udiwms/UdiwmsOrderResponse.java +++ b/src/main/java/com/glxp/mipsdl/res/udiwms/UdiwmsOrderResponse.java @@ -39,6 +39,7 @@ public class UdiwmsOrderResponse { private String invWarehouseName; private String fromSubInvName; private String billTypeName; + private String confirmUser; @Data public static class SubErpOrder { diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrOrderUploadBustypesMapper.xml b/src/main/resources/mybatis/mapper/thrsys/ThrOrderUploadBustypesMapper.xml new file mode 100644 index 0000000..adce9d1 --- /dev/null +++ b/src/main/resources/mybatis/mapper/thrsys/ThrOrderUploadBustypesMapper.xml @@ -0,0 +1,4 @@ + + + +