第三方出库明细

dev_fifo1.0
anthonywj 1 year ago
parent 1551cd46e2
commit 778258acec

@ -162,8 +162,7 @@ public class ThrInvOrderController {
*/
@PostMapping("/udiwms/thrsys/downloadInvOrder")
public BaseResponse downloadInvOrder(@RequestBody @Valid FilterDownloadInvOrderRequest filterDownloadInvOrderRequest) {
thrInvOrderService.downloadInvSfOrderFilter(filterDownloadInvOrderRequest);
return ResultVOUtils.success();
return thrInvOrderService.downloadInvSfOrderFilter(filterDownloadInvOrderRequest);
}
/**

@ -118,6 +118,8 @@ public class ThrInvOrder implements Serializable {
*/
private Integer skProject;
private String fromCorp;
private static final long serialVersionUID = 1L;
}

@ -1,205 +0,0 @@
package com.glxp.api.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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
@ApiModel(value="com-glxp-api-entity-thrsys-ThrInvOrderDetail")
@Data
@TableName(value = "thr_inv_order_detail")
public class ThrInvOrderDetailEntity implements Serializable {
@TableId(value = "id", type = IdType.INPUT)
@ApiModelProperty(value="")
private Integer id;
/**
*
*/
@TableField(value = "orderIdFk")
@ApiModelProperty(value="单据号")
private String orderIdFk;
/**
*
*/
@TableField(value = "cpmctymc")
@ApiModelProperty(value="产品通用名称")
private String cpmctymc;
/**
*
*/
@TableField(value = "relId")
@ApiModelProperty(value="物资字典主键")
private Integer relId;
/**
* /
*/
@TableField(value = "thrCode")
@ApiModelProperty(value="第三方项目编码/耗材字典")
private String thrCode;
/**
* DI
*/
@TableField(value = "nameCode")
@ApiModelProperty(value="DI")
private String nameCode;
/**
*
*/
@TableField(value = "ggxh")
@ApiModelProperty(value="规格型号")
private String ggxh;
/**
*
*/
@TableField(value = "batchNo")
@ApiModelProperty(value="批次号")
private Integer batchNo;
/**
*
*/
@TableField(value = "measname")
@ApiModelProperty(value="计量单位")
private String measname;
/**
*
*/
@TableField(value = "price")
@ApiModelProperty(value="价格")
private BigDecimal price;
/**
*
*/
@TableField(value = "productionDate")
@ApiModelProperty(value="生产日期")
private Date productionDate;
/**
*
*/
@TableField(value = "expireDate")
@ApiModelProperty(value="失效日期")
private Date expireDate;
/**
*
*/
@TableField(value = "ylqxzcrbarmc")
@ApiModelProperty(value="医疗器械注册备案人")
private String ylqxzcrbarmc;
/**
* /
*/
@TableField(value = "zczbhhzbapzbh")
@ApiModelProperty(value="注册/备案号")
private String zczbhhzbapzbh;
/**
*
*/
@TableField(value = "inCount")
@ApiModelProperty(value="入库数量")
private String inCount;
/**
*
*/
@TableField(value = "outCount")
@ApiModelProperty(value="出库数量")
private String outCount;
/**
*
*/
@TableField(value = "supName")
@ApiModelProperty(value="供应商")
private String supName;
/**
*
*/
@TableField(value = "deptName")
@ApiModelProperty(value="部门")
private String deptName;
/**
*
*/
@TableField(value = "deptCode")
@ApiModelProperty(value="部门编码")
private String deptCode;
/**
*
*/
@TableField(value = "invName")
@ApiModelProperty(value="仓库")
private String invName;
/**
*
*/
@TableField(value = "invCode")
@ApiModelProperty(value="仓库编码")
private String invCode;
/**
*
*/
@TableField(value = "spaceCode")
@ApiModelProperty(value="货位")
private String spaceCode;
/**
*
*/
@TableField(value = "spaceName")
@ApiModelProperty(value="货位编码")
private String spaceName;
/**
*
*/
@TableField(value = "reCount")
@ApiModelProperty(value="实际数量")
private String reCount;
/**
*
*/
@TableField(value = "mainAction")
@ApiModelProperty(value="出入库类型")
private String mainAction;
/**
*
*/
@TableField(value = "manufacturer")
@ApiModelProperty(value="生产企业")
private String manufacturer;
/**
*
*/
@TableField(value = "remark")
@ApiModelProperty(value="备注")
private String remark;
private static final long serialVersionUID = 1L;
}

@ -1,132 +0,0 @@
package com.glxp.api.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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
*
*/
@ApiModel(value = "com-glxp-api-entity-thrsys-ThrInvOrder")
@Data
@TableName(value = "thr_inv_order")
public class ThrInvOrderEntity implements Serializable {
@TableId(value = "id", type = IdType.INPUT)
@ApiModelProperty(value = "")
private Integer id;
/**
*
*/
@TableField(value = "billNo")
@ApiModelProperty(value = "单据号")
private String billNo;
/**
*
*/
@TableField(value = "billDate")
@ApiModelProperty(value = "单据时间")
private Date billDate;
/**
*
*/
@TableField(value = "startDate")
@ApiModelProperty(value = "库存开始时间")
private Date startDate;
/**
*
*/
@TableField(value = "endDate")
@ApiModelProperty(value = "库存结束时间")
private Date endDate;
/**
*
*/
@TableField(value = "mainAction")
@ApiModelProperty(value = "出入库类型")
private String mainAction;
/**
*
*/
@TableField(value = "billType")
@ApiModelProperty(value = "第三方单据类型")
private String billType;
/**
*
*/
@TableField(value = "deptCode")
@ApiModelProperty(value = "部门编码")
private String deptCode;
/**
*
*/
@TableField(value = "invCode")
@ApiModelProperty(value = "仓库编码")
private String invCode;
/**
*
*/
@TableField(value = "spaceCode")
@ApiModelProperty(value = "货位编码")
private String spaceCode;
/**
*
*/
@TableField(value = "`status`")
@ApiModelProperty(value = "单据状态")
private Byte status;
/**
*
*/
@TableField(value = "createTime")
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**
*
*/
@TableField(value = "`createUser`")
@ApiModelProperty(value = "创建人")
private String createUser;
/**
*
*/
@TableField(value = "updateTime")
@ApiModelProperty(value = "更新时间")
private Date updateTime;
/**
*
*/
@TableField(value = "updateUser")
@ApiModelProperty(value = "更新人")
private String updateUser;
/**
*
*/
@TableField(value = "remark")
@ApiModelProperty(value = "备注")
private String remark;
private static final long serialVersionUID = 1L;
}

@ -39,6 +39,10 @@ public class ThrSystemBusApiEntity {
@TableField(value = "remark")
private String remark;
@TableField(value = "fromCorp")
private String fromCorp;
/**
*
*/

@ -0,0 +1,114 @@
package com.glxp.api.res.thrsys;
import lombok.Data;
import java.util.Date;
@Data
public class ThrInvOrderResponse {
private String billTypeName;
private String invName;
private Long id;
/**
*
*/
private String billNo;
/**
*
*/
private Date billDate;
/**
*
*/
private Date startDate;
/**
*
*/
private Date endDate;
/**
*
*/
private String mainAction;
/**
*
*/
private String billType;
/**
*
*/
private String thirdSysFk;
/**
*
*/
private String deptCode;
/**
*
*/
private String invCode;
/**
*
*/
private String spaceCode;
/**
*
*/
private Integer status;
/**
*
*/
private Date createTime;
/**
*
*/
private String createUser;
/**
*
*/
private Date updateTime;
/**
*
*/
private String updateUser;
/**
*
*/
private String remark;
/**
* 123
*/
private Integer sourceType;
/**
*
*/
private String exMsg;
/**
*
*/
private Integer skProject;
/**
*
*/
private String fromCorp;
}

@ -53,6 +53,7 @@ public class BasicDestinyRelService extends ServiceImpl<BasicDestinyRelMapper, B
basicSkProjectDetailEntity.setRelId(Long.parseLong(str.getUdiRlIdFk()));
basicSkProjectDetailEntity.setSupId(Long.parseLong(str.getUnitFk()));
basicSkProjectDetailEntity.setPId(basicDestinyRelRequest.getpId());
basicSkProjectDetailEntity.setCount(1);
basicDestinyRelEntitList.add(basicSkProjectDetailEntity);
}
Boolean flag = basicDestinyRelMapper.insertBatch(basicDestinyRelEntitList);

@ -1,5 +1,6 @@
package com.glxp.api.service.thrsys;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.entity.thrsys.ThrInvOrder;
import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
import com.glxp.api.req.inv.FilterInvProductRequest;
@ -15,7 +16,7 @@ public interface ThrInvOrderService {
/**
*
*/
public void handleExternalThrInvSfOrder(FilterInvProductRequest filterInvProductRequest);
BaseResponse handleExternalThrInvSfOrder(FilterInvProductRequest filterInvProductRequest);
/**
*
@ -35,6 +36,7 @@ public interface ThrInvOrderService {
/**
*
*
* @param filterThrInvOrderRequest
* @return
*/
@ -44,6 +46,7 @@ public interface ThrInvOrderService {
/**
*
*
* @param generateOrderRequest
* @return
*/
@ -53,6 +56,7 @@ public interface ThrInvOrderService {
/**
*
*
* @param refreshOrderRequest
* @return
*/
@ -60,12 +64,13 @@ public interface ThrInvOrderService {
/**
*
*
* @param refreshOrderRequest
* @return
*/
boolean refreshGhOrder(RefreshOrderRequest refreshOrderRequest);
void downloadInvSfOrderFilter(FilterDownloadInvOrderRequest filterDownloadInvOrderRequest);
BaseResponse downloadInvSfOrderFilter(FilterDownloadInvOrderRequest filterDownloadInvOrderRequest);
void downloadInvGhOrderFilter(FilterDownloadInvOrderRequest filterDownloadInvOrderRequest);

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageHelper;
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.constant.ConstantType;
@ -21,10 +22,7 @@ import com.glxp.api.entity.inout.IoCodeTempEntity;
import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.system.SystemParamConfigEntity;
import com.glxp.api.entity.thrsys.ThrInvOrder;
import com.glxp.api.entity.thrsys.ThrInvOrderDetail;
import com.glxp.api.entity.thrsys.ThrOrderEntity;
import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
import com.glxp.api.entity.thrsys.*;
import com.glxp.api.http.ErpInvClient;
import com.glxp.api.req.inv.FilterInvProductRequest;
import com.glxp.api.req.thrsys.FilterDownloadInvOrderRequest;
@ -45,6 +43,7 @@ import com.glxp.api.service.inout.IoOrderDetailBizService;
import com.glxp.api.service.inout.IoOrderService;
import com.glxp.api.service.system.SystemParamConfigService;
import com.glxp.api.service.thrsys.ThrInvOrderService;
import com.glxp.api.service.thrsys.ThrSystemBusApiService;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.IntUtil;
import com.glxp.api.util.OrderNoTypeBean;
@ -105,28 +104,40 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
@Override
public void handleExternalThrInvSfOrder(FilterInvProductRequest filterInvProductRequest) {
public BaseResponse handleExternalThrInvSfOrder(FilterInvProductRequest filterInvProductRequest) {
BaseResponse<PageSimpleResponse<ThrInvResultResponse>> baseResponse = erpInvClient.getInvSfResult(filterInvProductRequest);
if (baseResponse.getCode() == 20000) {
List<ThrInvResultResponse> list = baseResponse.getData().getList();
if (CollectionUtil.isNotEmpty(list)) {
Map<String, List<ThrInvResultResponse>> groupedByInv = list.stream()
.collect(Collectors.groupingBy(ThrInvResultResponse::getInvCode));
groupedByInv.forEach((invCode, invResultResponses) -> {
String billNo = generateBillNo(filterInvProductRequest);//单据号
//处理 返回实体 转换成 单据 和 单据明细
ThrInvOrder thrInvOrder = new ThrInvOrder();
List<ThrInvOrderDetail> thrInvOrderDetails = new ArrayList<>();
String thirdSys = filterInvProductRequest.getThirdSys();
handleExternalConvertThrInvOrderDetail(list, thrInvOrderDetails, billNo, thirdSys, thrInvOrder);
handleExternalConvertThrInvOrderDetail(invResultResponses, thrInvOrderDetails, billNo, thirdSys, thrInvOrder, 1);
if (CollectionUtil.isNotEmpty(thrInvOrderDetails)) {
handleExternalConvertThrInvOrder(billNo, filterInvProductRequest, thrInvOrder, list.get(0), Constant.THR_INV_SF_ORDER_TYPE);
handleExternalConvertThrInvOrder(billNo, filterInvProductRequest, thrInvOrder, invResultResponses.get(0), Constant.THR_INV_SF_ORDER_TYPE);
//保存数据
thrInvOrderMapper.insert(thrInvOrder);
thrInvOrderDetailMapper.insertBatch(thrInvOrderDetails);
}
});
}
return ResultVOUtils.success("下载成功!");
} else {
return baseResponse;
}
}
@Override
@ -140,7 +151,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
ThrInvOrder thrInvOrder = new ThrInvOrder();
List<ThrInvOrderDetail> thrInvOrderDetails = new ArrayList<>();
String thirdSys = filterInvProductRequest.getThirdSys();
handleExternalConvertThrInvOrderDetail(list, thrInvOrderDetails, billNo, thirdSys, thrInvOrder);
handleExternalConvertThrInvOrderDetail(list, thrInvOrderDetails, billNo, thirdSys, thrInvOrder, 0);
if (CollectionUtil.isNotEmpty(thrInvOrderDetails)) {
handleExternalConvertThrInvOrder(billNo, filterInvProductRequest, thrInvOrder, list.get(0), Constant.THR_INV_PH_ORDER_TYPE);
@ -670,14 +681,15 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
}
@Override
public void downloadInvSfOrderFilter(FilterDownloadInvOrderRequest filterDownloadInvOrderRequest) {
public BaseResponse downloadInvSfOrderFilter(FilterDownloadInvOrderRequest filterDownloadInvOrderRequest) {
log.info("手动抓取第三方收费出入库明细生成单据定时任务开始");
FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest();
filterInvProductRequest.setThirdSys(filterDownloadInvOrderRequest.getThirdSysFk());
filterInvProductRequest.setStartDate(stringToDate(filterDownloadInvOrderRequest.getStartDate() + " 00:00:00"));
filterInvProductRequest.setEndDate(stringToDate(filterDownloadInvOrderRequest.getEndDate() + " 23:59:59"));
handleExternalThrInvSfOrder(filterInvProductRequest);
log.info("手动抓取第三方收费出入库明细生成单据定时任务结束");
return handleExternalThrInvSfOrder(filterInvProductRequest);
}
@Override
@ -820,16 +832,22 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
* @param thrInvOrder
* @param thrInvResultResponse
*/
@Resource
ThrSystemBusApiService thrSystemBusApiService;
private void handleExternalConvertThrInvOrder(String billNo, FilterInvProductRequest
filterInvProductRequest, ThrInvOrder thrInvOrder, ThrInvResultResponse thrInvResultResponse, Integer SourceType) {
Date newDate = new Date();
ThrSystemBusApiEntity thrSystemBusApiEntity = thrSystemBusApiService.getOne(new QueryWrapper<ThrSystemBusApiEntity>().eq("code", thrInvResultResponse.getBillType()).last("limit 1"));
thrInvOrder.setBillNo(billNo);//单据号
thrInvOrder.setBillDate(newDate);//单据时间
thrInvOrder.setStartDate(filterInvProductRequest.getStartDate());//库存开始时间
thrInvOrder.setEndDate(filterInvProductRequest.getEndDate());//库存结束时间
thrInvOrder.setMainAction(thrInvResultResponse.getMainAction());//出入库类型
thrInvOrder.setBillType(thrInvResultResponse.getMainAction());//第三方单据类型
thrInvOrder.setBillType(thrInvResultResponse.getBillType());//第三方单据类型
thrInvOrder.setThirdSysFk(filterInvProductRequest.getThirdSys());//外部系统
thrInvOrder.setDeptCode(thrInvResultResponse.getDeptCode());//部门编号
thrInvOrder.setInvCode(thrInvResultResponse.getInvCode());//仓库代码
@ -837,6 +855,8 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
thrInvOrder.setStatus(ConstantStatus.SFIO_DRAFT);//单据状态 草稿
thrInvOrder.setSourceType(SourceType);//来源类型
thrInvOrder.setCreateTime(newDate);
if (thrSystemBusApiEntity != null)
thrInvOrder.setFromCorp(thrSystemBusApiEntity.getFromCorp());
thrInvOrder.setCreateUser("外部系统下载");
}
@ -850,9 +870,9 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
*/
private void handleExternalConvertThrInvOrderDetail
(List<ThrInvResultResponse> list, List<ThrInvOrderDetail> thrInvOrderDetails, String billNo, String
thirdSys, ThrInvOrder thrInvOrder) {
Integer inv_set_enable = Integer.valueOf(systemParamConfigService.selectValueByParamKey("inv_set_enable"));
if (inv_set_enable == null || inv_set_enable == 0) {//直接明细 不走项目组套
thirdSys, ThrInvOrder thrInvOrder, Integer sourceType) {
// Integer inv_set_enable = Integer.valueOf(systemParamConfigService.selectValueByParamKey("inv_set_enable"));
if (sourceType == 0) {//直接明细 不走项目组套
thrInvOrder.setSkProject(0);
List<String> thrCodes = list.stream().map(ThrInvResultResponse::getThrCode).collect(Collectors.toList());
MainIdRelIdAndProductResponse map = udiRelevanceService.selectMainIdRelIdAndProductMap(thrCodes, thirdSys);
@ -865,9 +885,9 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
Long relId = mainIdRelIdMap.get(thrCode);
Integer count;
if (ConstantType.TYPE_PUT.equals(mainAction)) {
count = Integer.valueOf(item.getInCount());
count = IntUtil.value(item.getInCount());
} else {
count = Integer.valueOf(item.getOutCount());
count = IntUtil.value(item.getOutCount());
}
ThrInvOrderDetail thrInvOrderDetail = new ThrInvOrderDetail();
BeanUtils.copyProperties(item, thrInvOrderDetail);

@ -4,7 +4,7 @@ server:
spring:
datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root
password: 123456
hikari:

@ -148,7 +148,7 @@
</select>
<select id="selectForThirdSys" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">
select action, name
select *
from basic_bussiness_type
where action not in (select code
from thr_system_bus_api)

@ -39,26 +39,12 @@
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
<!--@mbg.generated-->
delete from thr_inv_order
delete
from thr_inv_order
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.thrsys.ThrInvOrder" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into thr_inv_order (billNo, billDate, startDate,
endDate, mainAction, billType,thirdSysFk,
deptCode, invCode, spaceCode,
`status`, createTime, `createUser`,
updateTime, updateUser, remark,sourceType,exMsg,skProject
)
values (#{billNo,jdbcType=VARCHAR}, #{billDate,jdbcType=TIMESTAMP}, #{startDate,jdbcType=TIMESTAMP},
#{endDate,jdbcType=TIMESTAMP}, #{mainAction,jdbcType=VARCHAR}, #{billType,jdbcType=VARCHAR},#{thirdSysFk,jdbcType=VARCHAR},
#{deptCode,jdbcType=VARCHAR}, #{invCode,jdbcType=VARCHAR}, #{spaceCode,jdbcType=VARCHAR},
#{status,jdbcType=TINYINT}, #{createTime,jdbcType=TIMESTAMP}, #{createUser,jdbcType=VARCHAR},
#{updateTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{sourceType,jdbcType=INTEGER}
, #{exMsg,jdbcType=VARCHAR}, #{skProject,jdbcType=INTEGER}
)
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.thrsys.ThrInvOrder" useGeneratedKeys="true">
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.thrsys.ThrInvOrder"
useGeneratedKeys="true">
<!--@mbg.generated-->
insert into thr_inv_order
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -270,9 +256,11 @@
</update>
<select id="filterThrInvOrder" parameterType="com.glxp.api.req.thrsys.FilterThrInvOrderRequest"
resultType="com.glxp.api.entity.thrsys.ThrInvOrder">
SELECT thr_inv_order.*
FROM thr_inv_order
resultType="com.glxp.api.res.thrsys.ThrInvOrderResponse">
SELECT tio.*, bbt.name billTypeName, aw.name invName
FROM thr_inv_order tio
left join basic_bussiness_type bbt on tio.billType = bbt.action
left join auth_warehouse aw on tio.invCode = aw.code
<where>
<if test="billNo != '' and billNo != null">
AND billNo like concat('%', #{billNo}, '%')
@ -281,7 +269,7 @@
AND billType = #{billType}
</if>
<if test="thirdSysFk != '' and thirdSysFk != null">
AND thirdSysFk = #{thirdSysFk}
AND tio.thirdSysFk = #{thirdSysFk}
</if>
<if test="startDate != null and startDate != ''">
<![CDATA[
@ -297,6 +285,6 @@
AND sourceType = #{sourceType}
</if>
</where>
ORDER BY thr_inv_order.billdate DESC
ORDER BY tio.billdate DESC
</select>
</mapper>

@ -26,6 +26,9 @@
<if test="remark != null">
remark=#{remark},
</if>
<if test="fromCorp != null">
fromCorp=#{fromCorp},
</if>
</trim>
WHERE id = #{id}
</update>
@ -57,25 +60,25 @@
insert
ignore
INTO thr_system_bus_api
(`code`, `name`, thirdBuyCode, `thirdSys`, url, `type`, remark)
(`code`, `name`, thirdBuyCode, `thirdSys`, url, `type`, remark, fromCorp)
values (#{code},
#{name},
#{thirdBuyCode},
#{thirdSys},
#{url},
#{type},
#{remark})
#{remark}, #{fromCorp})
</insert>
<insert id="saveBusTypes">
insert into thr_system_bus_api (code, `name`, thirdBuyCode, thirdSys, type)
insert into thr_system_bus_api (code, `name`, thirdBuyCode, thirdSys, type, fromCorp)
values
<foreach collection="list" index="index" item="item" separator=",">
(#{item.code},
#{item.name},
#{item.thirdBuyCode},
#{item.thirdSys},
#{item.type})
#{item.type}#{item.fromCorp})
</foreach>
</insert>

@ -648,6 +648,9 @@ CALL Pro_Temp_ColumnWork('thr_inv_order_detail', 'supId',
CALL Pro_Temp_ColumnWork('basic_sk_project_detail', 'supId',
' varchar(30) NULL DEFAULT NULL COMMENT ''供应商ID'' AFTER `remark`', 1);
CALL Pro_Temp_ColumnWork('basic_sk_project_detail', 'thrName',
' varchar(30) NULL DEFAULT NULL COMMENT ''供应商ID'' AFTER `remark`', 1);
INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`,
`itrCache`, `fromType`, `time`, `dlLastTime`)
@ -713,3 +716,5 @@ CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailInvBatchNo',
CALL Pro_Temp_ColumnWork('io_code_temp', 'errUdiCode', 'varchar(255) NULL DEFAULT NULL COMMENT ''去掉错误符号异常UDI码''', 1);
CALL Pro_Temp_ColumnWork('io_code', 'errUdiCode', 'varchar(255) NULL DEFAULT NULL COMMENT ''去掉错误符号异常UDI码''', 1);
CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'fromCorp', 'varchar(255) NULL DEFAULT NULL COMMENT ''配置默认往来单位''', 1);
CALL Pro_Temp_ColumnWork('thr_inv_order', 'fromCorp', 'varchar(255) NULL DEFAULT NULL COMMENT ''配置默认往来单位''', 1);

Loading…
Cancel
Save