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

Merge branch 'dev' into test

Browse Source
pro
wj 3 years ago
parent 3221cb8d73 f52cdb3844
commit a74ce2f9d5
38 changed files with 267 additions and 151 deletions
Show Stats Download Patch File Download Diff File

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

@ -361,6 +361,7 @@ public class RegisterController {
basicUnitMaintainEntity1.setAddr(userRegisterEntity.getArea() + userRegisterEntity.getDetailAddr());
basicUnitMaintainEntity1.setContact(userRegisterEntity.getRealName());
basicUnitMaintainEntity1.setMobile(userRegisterEntity.getMobile());
basicUnitMaintainEntity1.setUpdateTime(new Date());
basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity1);
customerId = Long.parseLong(basicUnitMaintainEntity1.getErpId());
registerCheckRequest.setCompanyId(basicUnitMaintainEntity1.getErpId());

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

@ -21,6 +21,7 @@ import com.glxp.api.req.inout.*;
import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.inout.IoOrderDetailBizResponse;
import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
import com.glxp.api.res.inout.IoOrderResponse;
import com.glxp.api.res.inout.PdaBusOrderResponse;
import com.glxp.api.service.auth.InvBusUserService;
@ -36,6 +37,7 @@ import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -134,6 +136,22 @@ public class IoOrderController extends BaseController {
}
List<IoOrderResponse> list = orderService.getfilterList(filterOrderRequest);
for (IoOrderResponse ioOrderResponse : list) {
FilterOrderDetailCodeRequest filterOrderDetailCodeRequest = new FilterOrderDetailCodeRequest();
filterOrderDetailCodeRequest.setOrderIdFk(ioOrderResponse.getBillNo());
List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterList(filterOrderDetailCodeRequest);
BigDecimal amount=new BigDecimal(0.00);
for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
if(ioOrderDetailCodeRespons.getCount() != 0) {
amount = amount.add(new BigDecimal(ioOrderDetailCodeRespons.getCount()).multiply(ioOrderDetailCodeRespons.getPrice()));
}
}
ioOrderResponse.setAllAmount(amount);
}
PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);
return ResultVOUtils.page(pageInfo);
}

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

@ -32,6 +32,7 @@ import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.res.inout.IoOrderDetailBizResponse;
import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
import com.glxp.api.res.inout.IoOrderInvoiceResponse;
import com.glxp.api.service.auth.InvWarehouseService;
import com.glxp.api.service.basic.*;
@ -513,14 +514,14 @@ public class IoOrderDetailBizController extends BaseController {
return ResultVOUtils.page(pageInfo);
}
@GetMapping("/udiwms/inout/bizDetail/filterListInv")
public BaseResponse filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest) {
List<IoOrderDetailBizResponse> list = orderDetailBizService.getfilterList(orderDetailBizRequest);
List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderDetailBizRequest.getOrderIdFk());
ioCheckInoutService.bizOrderCheck2(list, orderDetailCodeEntities);
PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(list);
return ResultVOUtils.page(pageInfo);
}
// @GetMapping("/udiwms/inout/bizDetail/filterListInv")
// public BaseResponse filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest) {
// List<IoOrderDetailBizResponse> list = orderDetailBizService.getfilterList(orderDetailBizRequest);
// List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderDetailBizRequest.getOrderIdFk());
// ioCheckInoutService.bizOrderCheck2(list, orderDetailCodeEntities);
// PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(list);
// return ResultVOUtils.page(pageInfo);
// }
@GetMapping("/udiwms/inout/bizDetail/filterListInvoice")
public BaseResponse filterListInvoice(FilterOrderDetailBizRequest orderDetailBizRequest) {
@ -561,7 +562,7 @@ public class IoOrderDetailBizController extends BaseController {
ioOrderInvoiceService.deleteByInvId(ioOrderInvoiceEntity.getId()+"");
//更改 登记状态
IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
IoOrderDetailCodeEntity ioOrderDetailBizEntity = new IoOrderDetailCodeEntity();
FilterOrderDetailBizRequest filterOrderDetailBizRequest = new FilterOrderDetailBizRequest();
@ -575,7 +576,7 @@ public class IoOrderDetailBizController extends BaseController {
if(list == null && list.size()==0){
ioOrderDetailBizEntity.setRegStatus(false);
}
orderDetailBizService.updateOrderDetailBiz(ioOrderDetailBizEntity);
orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity);
return ResultVOUtils.success();
@ -627,10 +628,10 @@ public class IoOrderDetailBizController extends BaseController {
}
@PostMapping("/udiwms/inout/biz/updateorderBiz")
public BaseResponse updateorderBiz(@RequestBody List<IoOrderDetailBizEntity> list) {
for (IoOrderDetailBizEntity ioOrderDetailBizEntity : list) {
public BaseResponse updateorderBiz(@RequestBody List<IoOrderDetailCodeEntity> list) {
for (IoOrderDetailCodeEntity ioOrderDetailBizEntity : list) {
ioOrderDetailBizEntity.setRegStatus(true);
orderDetailBizService.updateOrderDetailBiz(ioOrderDetailBizEntity);
orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity);
}
return ResultVOUtils.success("成功");
@ -645,13 +646,14 @@ public class IoOrderDetailBizController extends BaseController {
* @return
*/
@GetMapping("/udiwms/inout/bizDetail/filterBizOrderList")
public BaseResponse filterBizOrderList(FilterOrderDetailBizRequest orderDetailBizRequest) {
List<IoOrderDetailBizResponse> list = orderDetailBizService.getfilterList(orderDetailBizRequest);
for (IoOrderDetailBizResponse ioOrderDetailBizResponse : list) {
public BaseResponse filterBizOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest) {
List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterList(orderDetailBizRequest);
for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
ioOrderDetailCodeRespons.setAmount(new BigDecimal(ioOrderDetailCodeRespons.getCount()).multiply(ioOrderDetailCodeRespons.getPrice()));
String msg = "";
IoOrderInvoiceRequest ioOrderInvoiceEntity = new IoOrderInvoiceRequest();
ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailBizResponse.getOrderIdFk());
ioOrderInvoiceEntity.setBizIdFk(ioOrderDetailBizResponse.getId());
ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailCodeRespons.getOrderIdFk());
ioOrderInvoiceEntity.setBizIdFk(ioOrderDetailCodeRespons.getId());
List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList = ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceEntity);
for (IoOrderInvoiceEntity obj : ioOrderInvoiceEntityList) {
if (StrUtil.isNotEmpty(obj.getInvoiceEncode())) {
@ -661,9 +663,9 @@ public class IoOrderDetailBizController extends BaseController {
if (msg.length() > 1) {
msg = msg.substring(1);
}
ioOrderDetailBizResponse.setInvoiceCodes(msg);
ioOrderDetailCodeRespons.setInvoiceCodes(msg);
}
PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(list);
PageInfo<IoOrderDetailCodeResponse> pageInfo = new PageInfo<>(ioOrderDetailCodeResponses);
return ResultVOUtils.page(pageInfo);
}

31
src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
Unescape Escape View File

@ -31,7 +31,9 @@ import com.glxp.api.entity.thrsys.*;
import com.glxp.api.req.sync.SpsSyncDataRequest;
import com.glxp.api.req.sync.SyncUpLoadRequest;
import com.glxp.api.res.sync.*;
import com.glxp.api.service.auth.InvWarehouseService;
import com.glxp.api.service.basic.IBasicBusTypeChangeService;
import com.glxp.api.service.basic.IBasicBussinessTypeService;
import com.glxp.api.service.inout.IoAddInoutService;
import com.glxp.api.service.inout.IoCheckInoutService;
import com.glxp.api.service.inout.IoOrderService;
@ -600,6 +602,10 @@ public class SpsSyncDownloadController {
IoOrderDetailResultDao orderDetailResultDao;
@Resource
IoOrderInvoiceMapper orderInvoiceMapper;
@Resource
IBasicBussinessTypeService basicBussinessTypeService;
@Resource
InvWarehouseService invWarehouseService;
//接收中继服务、UDI管理系统上传单据
@AuthRuleAnnotation("sps/sync/order/upload")
@ -616,7 +622,6 @@ public class SpsSyncDownloadController {
basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity);
StringBuffer remark = new StringBuffer();
if (CollUtil.isNotEmpty(syncDataResponse.getOrderEntities())) {
try {
List<IoOrderEntity> orderEntities = syncDataResponse.getOrderEntities();
for (IoOrderEntity orderEntity : orderEntities) {
orderEntity.setUpdateTime(null);
@ -624,10 +629,29 @@ public class SpsSyncDownloadController {
orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_POST);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
IoOrderEntity temp = orderService.findById(orderEntity.getBillNo());
if (temp == null) {
// 过滤使用出库单，转换成一级库出库单(条件：往来类型为客户信息，出入库类型为出库，仓库类型为入账库，是否更改库存为是
BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
if (basicBussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT
&& basicBussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT)
&& basicBussinessTypeEntity.isInStock() && basicBussinessTypeEntity.getActionType() == 1) {
// orderEntity.getInvCode()
InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode());
InvWarehouseEntity parentInv = invWarehouseService.findOneLevel(invWarehouseEntity.getParentCode());
if (parentInv == null)
parentInv = invWarehouseEntity;
orderEntity.setInvCode(parentInv.getCode());
orderEntity.setDeptCode(parentInv.getParentId());
orderEntity.setFromCorp("科室使用出库");
}
orderEntity.setId(null);
orderDao.insert(orderEntity);
//更新码详情
if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailCodeEntities())) {
List<IoCodeEntity> warehouseEntityList = syncDataResponse.getCodeEntities();
@ -708,9 +732,6 @@ public class SpsSyncDownloadController {
if (CollUtil.isNotEmpty(syncDataResponse.getCodeEntities()))
logs = logs + "单据条码信息：" + syncDataResponse.getCodeEntities().size() + "条\n";
remark.append(logs);
} catch (Exception e) {
e.printStackTrace();
}
}
String fileFullPath = null;
try {

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

@ -3,7 +3,9 @@ package com.glxp.api.dao.inout;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
import com.glxp.api.res.inout.IoOrderDetailBizResponse;
import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
import com.glxp.api.res.inout.IoOrderInvoiceResponse;
import org.apache.ibatis.annotations.Param;
@ -19,7 +21,7 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus<IoOrderDetailBizDao,
*/
List<IoOrderDetailBizResponse> filterList(FilterOrderDetailBizRequest orderDetailBizRequest);
List<IoOrderDetailBizResponse> getfilterList(FilterOrderDetailBizRequest orderDetailBizRequest);
List<IoOrderDetailCodeResponse> getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest);
List<IoOrderInvoiceResponse> filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest);

4
src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java
Unescape Escape View File

@ -191,5 +191,9 @@ public class IoOrderDetailCodeEntity {
@TableField(exist = false)
private String errMsg;
@TableField(value = "regStatus")
private boolean regStatus;
}

3
src/main/java/com/glxp/api/req/inout/FilterOrderDetailCodeRequest.java
Unescape Escape View File

@ -8,6 +8,7 @@ import lombok.Data;
*/
@Data
public class FilterOrderDetailCodeRequest extends ListPageRequest {
private Long relId;
/**
* 单据号
@ -39,4 +40,6 @@ public class FilterOrderDetailCodeRequest extends ListPageRequest {
*/
private String productName;
private Long bizIdFk;
}

9
src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java
Unescape Escape View File

@ -162,4 +162,13 @@ public class IoOrderDetailCodeResponse {
private int orderCount;
private String invoiceCodes;
private Integer sucCount;
private boolean regStatus;
//金额
private BigDecimal amount;
}

4
src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
Unescape Escape View File

@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
@Data
@ -236,6 +237,9 @@ public class IoOrderResponse {
private Integer partCount;
//总金额
private BigDecimal allAmount;
/**

3
src/main/java/com/glxp/api/service/auth/InvWarehouseService.java
Unescape Escape View File

@ -96,4 +96,7 @@ public interface InvWarehouseService {
List<InvWarehouseEntity> selectLowWarehouseAll(String pCode);
InvWarehouseEntity findOneLevel(String code);
}

2
src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java
Unescape Escape View File

@ -57,7 +57,7 @@ public class InvSpaceServiceImpl implements InvSpaceService {
//获取当前仓库下的最大货位编码
String maxSpaceCode = invSpaceDao.getMaxSpaceCode(invSpace.getInvWarehouseCode());
String maxSpaceCode = invSpaceDao.getMaxSpaceCode(null);
if (StrUtil.isBlank(maxSpaceCode)) {
maxSpaceCode = "0000";
}

17
src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java
Unescape Escape View File

@ -255,4 +255,21 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
public List<InvWarehouseEntity> selectLowWarehouseAll(String pCode) {
return invWarehouseDao.selectLowWarehouseAll(pCode);
}
@Override
public InvWarehouseEntity findOneLevel(String code) {
int index = 1;
while (index < 6) { //仓库层级一般不会超过5级
InvWarehouseEntity invWarehouseEntity = findByInvSubByCode(code);
if (invWarehouseEntity != null) {
if (StrUtil.isEmpty(invWarehouseEntity.getParentCode()))
return invWarehouseEntity;
else {
code = invWarehouseEntity.getParentCode();
index++;
}
}
}
return null;
}
}

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

@ -121,7 +121,8 @@ public class IoAddInoutService {
basicCorpEntity.setOutType(ConstantStatus.CORP_SICK_SICK);
basicCorpEntity.setName(orderEntity.getFromCorp());
basicCorpEntity.setId(IdUtil.getSnowflakeNextId());
basicCorpService.insertBasicUnitMaintain(basicCorpEntity);
basicCorpEntity.setUpdateTime(new Date());
basicCorpService.insert(basicCorpEntity);
}
orderEntity.setFromCorp(basicCorpEntity.getErpId());

4
src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java
Unescape Escape View File

@ -2,7 +2,9 @@ package com.glxp.api.service.inout;
import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
import com.glxp.api.res.inout.IoOrderDetailBizResponse;
import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
import com.glxp.api.res.inout.IoOrderInvoiceResponse;
import java.util.List;
@ -34,7 +36,7 @@ public interface IoOrderDetailBizService {
List<IoOrderDetailBizResponse> filterList(FilterOrderDetailBizRequest orderDetailBizRequest);
List<IoOrderDetailBizResponse> getfilterList(FilterOrderDetailBizRequest orderDetailBizRequest);
List<IoOrderDetailCodeResponse> getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest);
IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk);

4
src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.service.inout;
import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
@ -47,4 +48,7 @@ public interface IoOrderDetailCodeService {
* @return
*/
List<IoOrderDetailCodeResponse> getDetailCodeResponse(List<IoOrderDetailCodeEntity> orderEntityList);
Boolean updateOrderDetailBiz(IoOrderDetailCodeEntity orderDetailCodeEntity);
}

12
src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java
Unescape Escape View File

@ -10,7 +10,9 @@ import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
import com.glxp.api.res.inout.IoOrderDetailBizResponse;
import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
import com.glxp.api.res.inout.IoOrderInvoiceResponse;
import com.glxp.api.service.inout.IoCheckInoutService;
import com.glxp.api.service.inout.IoOrderDetailBizService;
@ -118,14 +120,14 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
}
@Override
public List<IoOrderDetailBizResponse> getfilterList(FilterOrderDetailBizRequest orderDetailBizRequest) {
if (null == orderDetailBizRequest) {
public List<IoOrderDetailCodeResponse> getfilterList(FilterOrderDetailCodeRequest OrderDetailCodeRequest) {
if (null == OrderDetailCodeRequest) {
return Collections.emptyList();
}
if (null != orderDetailBizRequest.getPage() && null != orderDetailBizRequest.getLimit()) {
PageHelper.offsetPage((orderDetailBizRequest.getPage() - 1) * orderDetailBizRequest.getLimit(), orderDetailBizRequest.getLimit());
if (null != OrderDetailCodeRequest.getPage() && null != OrderDetailCodeRequest.getLimit()) {
PageHelper.offsetPage((OrderDetailCodeRequest.getPage() - 1) * OrderDetailCodeRequest.getLimit(), OrderDetailCodeRequest.getLimit());
}
return ioOrderDetailBizDao.getfilterList(orderDetailBizRequest);
return ioOrderDetailBizDao.getfilterList(OrderDetailCodeRequest);
}
@Override

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

@ -115,4 +115,10 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
}
return list;
}
@Override
public Boolean updateOrderDetailBiz(IoOrderDetailCodeEntity orderDetailCodeEntity) {
return ioOrderDetailCodeDao.updateById(orderDetailCodeEntity)>0;
}
}

3
src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java
Unescape Escape View File

@ -237,7 +237,8 @@ public class SpsSyncDownloadService {
if (!result) {
String errorMsg = String.format("syncIdcSps----process------------同步[%s]重复进入", exportEnum.getRemark());
// logger.info(errorMsg);
throw new RuntimeException(errorMsg);
// throw new RuntimeException(errorMsg);
log.error(errorMsg);
}
BasicExportStatusEntity exportStatus = basicExportService.getOne(Wrappers.lambdaQuery(BasicExportStatusEntity.class)
.eq(BasicExportStatusEntity::getType, exportEnum.getRemark())

3
src/main/java/com/glxp/api/util/page/ListPageRequest.java
Unescape Escape View File

@ -20,4 +20,7 @@ public class ListPageRequest {
@Max(value = 500, message = "分页参数不能大于500")
private Integer limit;
private String orderBy;
private String sort;
}

4
src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml
Unescape Escape View File

@ -1,8 +1,8 @@
<?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.auth.InvSpaceDao">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.auth.InvSpace">
<id column="id" jdbcType="INTEGER" property="id"/>
<resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.auth.InvSpace">
<!-- <id column="id" jdbcType="INTEGER" property="id"/>-->
<result column="code" jdbcType="VARCHAR" property="code"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="type" jdbcType="VARCHAR" property="type"/>

4
src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml
Unescape Escape View File

@ -1,10 +1,10 @@
<?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.auth.WarehouseBussinessTypeDao">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity">
<resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity">
<!--@mbg.generated-->
<!--@Table auth_warehouse_bustype-->
<id column="id" jdbcType="INTEGER" property="id"/>
<!-- <id column="id" jdbcType="INTEGER" property="id"/>-->
<result column="code" jdbcType="VARCHAR" property="code"/>
<result column="action" jdbcType="VARCHAR" property="action"/>
<result column="name" jdbcType="VARCHAR" property="name"/>

6
src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml
Unescape Escape View File

@ -1,14 +1,14 @@
<?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.auth.WarehouseUserDao">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.auth.WarehouseUserEntity">
<resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.auth.WarehouseUserEntity">
<!--@mbg.generated-->
<!--@Table auth_warehouse_user-->
<id column="id" jdbcType="INTEGER" property="id"/>
<!-- <id column="id" jdbcType="INTEGER" property="id"/>-->
<result column="code" jdbcType="VARCHAR" property="code"/>
<result column="userId" jdbcType="BIGINT" property="userid"/>
<result column="userName" jdbcType="VARCHAR" property="username"/>
<result column="isDirector" javaType="boolean" property="isDirector"/>
<!-- <result column="isDirector" javaType="boolean" property="isDirector"/>-->
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->

4
src/main/resources/mybatis/mapper/basic/BasicHospTypeDao.xml
Unescape Escape View File

@ -1,10 +1,10 @@
<?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.basic.BasicHospTypeDao">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.basic.BasicHospTypeEntity">
<resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.basic.BasicHospTypeEntity">
<!--@mbg.generated-->
<!--@Table basic_hosp_type-->
<id column="id" jdbcType="INTEGER" property="id" />
<!-- <id column="id" jdbcType="INTEGER" property="id" />-->
<result column="code" jdbcType="VARCHAR" property="code" />
<result column="parentCode" jdbcType="VARCHAR" property="parentCode" />
<result column="name" jdbcType="VARCHAR" property="name" />

8
src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
Unescape Escape View File

@ -149,11 +149,11 @@
(select name from auth_warehouse aw2 where aw2.code = io.fromInvCode) fromInvName,
(select name from basic_corp bc where bc.erpId = io.fromCorp) fromCorpName,
(select name from basic_corp bc where bc.erpId = io.customerId) customerName,
(SELECT count(*) FROM io_order_detail_biz WHERE io_order_detail_biz.orderIdFk = io.billNo
and io_order_detail_biz.regStatus = 1
(SELECT count(*) FROM io_order_detail_code WHERE io_order_detail_code.orderIdFk = io.billNo
and io_order_detail_code.regStatus = 1
) AS allCout,
(SELECT count(*) FROM io_order_detail_biz WHERE io_order_detail_biz.orderIdFk = io.billNo
and io_order_detail_biz.regStatus = 0
(SELECT count(*) FROM io_order_detail_code WHERE io_order_detail_code.orderIdFk = io.billNo
and io_order_detail_code.regStatus = 0
) As partCount
from io_order as io
<where>

12
src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
Unescape Escape View File

@ -23,13 +23,13 @@
group by io_order_detail_biz.id
</select>
<select id="getfilterList" resultType="com.glxp.api.res.inout.IoOrderDetailBizResponse">
select io_order_detail_biz.*,
<select id="getfilterList" resultType="com.glxp.api.res.inout.IoOrderDetailCodeResponse">
select io_order_detail_code.*,
(select count(*)
FROM io_order_invoice
where io_order_invoice.orderIdFk = io_order_detail_biz.orderIdFk) as sucCount
from io_order_detail_biz
left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
where io_order_invoice.orderIdFk = io_order_detail_code.orderIdFk) as sucCount
from io_order_detail_code
left join basic_udirel bu on bu.id = io_order_detail_code.bindRlFk
left join basic_products bp on bu.uuid = bp.uuid
<where>
<if test="orderIdFk != null and orderIdFk != ''">
@ -45,7 +45,7 @@
AND bp.cpmctymc like concat('%', #{productName}, '%')
</if>
</where>
group by io_order_detail_biz.id
group by io_order_detail_code.id
</select>

4
src/main/resources/mybatis/mapper/inout/IoOrderUploadLogDao.xml
Unescape Escape View File

@ -1,10 +1,10 @@
<?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.inout.IoOrderUploadLogDao">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.inout.IoOrderUploadLogEntity">
<resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.inout.IoOrderUploadLogEntity">
<!--@mbg.generated-->
<!--@Table io_order_upload_log-->
<id column="id" jdbcType="INTEGER" property="id"/>
<!-- <id column="id" jdbcType="INTEGER" property="id"/>-->
<result column="billNo" jdbcType="VARCHAR" property="billNo"/>
<result column="billDate" jdbcType="TIMESTAMP" property="billDate"/>
<result column="billType" jdbcType="VARCHAR" property="billType"/>

4
src/main/resources/mybatis/mapper/inv/InvInnerOrderPdfTempDao.xml
Unescape Escape View File

@ -1,10 +1,10 @@
<?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.inv.InvInnerOrderPdfTempDao">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity">
<resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity">
<!--@mbg.generated-->
<!--@Table inv_inner_order_pdf_temp-->
<id column="id" jdbcType="INTEGER" property="id" />
<!-- <id column="id" jdbcType="INTEGER" property="id" />-->
<result column="genkey" jdbcType="VARCHAR" property="genkey" />
<result column="fileName" jdbcType="VARCHAR" property="fileName" />
<result column="filePath" jdbcType="VARCHAR" property="filePath" />

4
src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml
Unescape Escape View File

@ -1,10 +1,10 @@
<?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.inv.InvInnerOrderPrintDao">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.inv.InvInnerOrderPrintEntity">
<resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.inv.InvInnerOrderPrintEntity">
<!--@mbg.generated-->
<!--@Table inv_inner_order_print-->
<id column="id" jdbcType="INTEGER" property="id"/>
<!-- <id column="id" jdbcType="INTEGER" property="id"/>-->
<result column="orderIdFk" jdbcType="VARCHAR" property="orderIdFk"/>
<result column="udiCode" jdbcType="VARCHAR" property="udiCode"/>
<result column="productId" jdbcType="VARCHAR" property="productId"/>

4
src/main/resources/mybatis/mapper/purchase/PurDeliveryCodeDao.xml
Unescape Escape View File

@ -1,10 +1,10 @@
<?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.purchase.PurDeliveryCodeDao">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.purchase.PurDeliveryCodeEntity">
<resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.purchase.PurDeliveryCodeEntity">
<!--@mbg.generated-->
<!--@Table pur_delivery_code-->
<id column="id" jdbcType="INTEGER" property="id" />
<!-- <id column="id" jdbcType="INTEGER" property="id" />-->
<result column="orderIdFk" jdbcType="VARCHAR" property="orderidfk" />
<result column="code" jdbcType="VARCHAR" property="code" />
<result column="nameCode" jdbcType="VARCHAR" property="namecode" />

4
src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml
Unescape Escape View File

@ -1,10 +1,10 @@
<?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.purchase.PurOrderDetailDao">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.purchase.PurOrderDetailEntity">
<resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.purchase.PurOrderDetailEntity">
<!--@mbg.generated-->
<!--@Table pur_order_detail-->
<id column="id" jdbcType="INTEGER" property="id" />
<!-- <id column="id" jdbcType="INTEGER" property="id" />-->
<result column="orderIdFk" jdbcType="VARCHAR" property="orderIdFk" />
<result column="productId" jdbcType="INTEGER" property="productId" />
<result column="productName" jdbcType="VARCHAR" property="productName" />

11
src/main/resources/mybatis/mapper/sync/BasicExportDao.xml
Unescape Escape View File

@ -30,7 +30,18 @@
and receiveStatus = #{receiveStatus}
</if>
</where>
<choose>
<when test="(orderBy!=null ) and (sort=='desc' or sort=='asc')">
order by ${orderBy} ${sort}
</when>
<otherwise>
ORDER BY updateTime DESC
</otherwise>
</choose>
</select>

4
src/main/resources/mybatis/mapper/sync/SyncDataChangeBustypesDao.xml
Unescape Escape View File

@ -1,10 +1,10 @@
<?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.sync.SyncDataChangeBustypesDao">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.sync.SyncDataChangeBustypesEntity">
<resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.sync.SyncDataChangeBustypesEntity">
<!--@mbg.generated-->
<!--@Table sync_data_change_bustypes-->
<id column="id" jdbcType="INTEGER" property="id"/>
<!-- <id column="id" jdbcType="INTEGER" property="id"/>-->
<result column="action" jdbcType="VARCHAR" property="action"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="outChange" jdbcType="TINYINT" property="outChange"/>

4
src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml
Unescape Escape View File

@ -1,10 +1,10 @@
<?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.system.SysPdfTemplateRelevanceBizDao">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity">
<resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity">
<!--@mbg.generated-->
<!--@Table sys_pdf_template_relevance_biz-->
<id column="id" jdbcType="INTEGER" property="id"/>
<!-- <id column="id" jdbcType="INTEGER" property="id"/>-->
<result column="templateId" jdbcType="INTEGER" property="templateId"/>
<result column="customerId" jdbcType="BIGINT" property="customerId"/>
<result column="adminId" jdbcType="INTEGER" property="adminId"/>

4
src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml
Unescape Escape View File

@ -1,10 +1,10 @@
<?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.system.SysPdfTemplateRelevanceCodeDao">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity">
<resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity">
<!--@mbg.generated-->
<!--@Table sys_pdf_template_relevance_code-->
<id column="id" jdbcType="INTEGER" property="id"/>
<!-- <id column="id" jdbcType="INTEGER" property="id"/>-->
<result column="templateId" jdbcType="INTEGER" property="templateId"/>
<result column="customerId" jdbcType="BIGINT" property="customerId"/>
<result column="adminId" jdbcType="INTEGER" property="adminId"/>

4
src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceLabelDao.xml
Unescape Escape View File

@ -1,10 +1,10 @@
<?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.system.SysPdfTemplateRelevanceLabelDao">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity">
<resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity">
<!--@mbg.generated-->
<!--@Table sys_pdf_template_relevance_label-->
<id column="id" jdbcType="INTEGER" property="id"/>
<!-- <id column="id" jdbcType="INTEGER" property="id"/>-->
<result column="templateId" jdbcType="INTEGER" property="templateId"/>
<result column="customerId" jdbcType="BIGINT" property="customerId"/>
<result column="adminId" jdbcType="INTEGER" property="adminId"/>

4
src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceStatemenDao.xml
Unescape Escape View File

@ -1,10 +1,10 @@
<?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.system.SysPdfTemplateRelevanceStatemenDao">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity">
<resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity">
<!--@mbg.generated-->
<!--@Table sys_pdf_template_relevance_statemen-->
<id column="id" jdbcType="INTEGER" property="id"/>
<!-- <id column="id" jdbcType="INTEGER" property="id"/>-->
<result column="templateId" jdbcType="INTEGER" property="templateId"/>
<result column="customerId" jdbcType="BIGINT" property="customerId"/>
<result column="adminId" jdbcType="INTEGER" property="adminId"/>

4
src/main/resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml
Unescape Escape View File

@ -3,8 +3,8 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.thrsys.ThrBusTypeOriginDao">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity">
<id column="id" jdbcType="INTEGER" property="id"/>
<resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity">
<!-- <id column="id" jdbcType="INTEGER" property="id"/>-->
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="action" jdbcType="VARCHAR" property="action"/>
<result column="thirdSys" jdbcType="VARCHAR" property="thirdSys"/>

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

@ -35,7 +35,6 @@ CALL Pro_Temp_ColumnWork('io_order', 'checkTime', 'datetime ', 1);
CALL Pro_Temp_ColumnWork('io_order', 'checkUser', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('io_order', 'regStatus', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'regStatus', 'varchar(255) ', 1);
@ -336,6 +335,7 @@ CALL Pro_Temp_ColumnWork('thr_bustype_origin', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_user', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_user_bustype', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_user_bustype', 'userId', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_dept', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_warehouse', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_warehouse_bustype', 'id', 'bigint', 2);
@ -350,9 +350,6 @@ CALL Pro_Temp_ColumnWork('thr_inv_warehouse', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('thr_products', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('thr_corp', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_dept_user', 'userId', 'bigint', 2);
CALL Pro_Temp_ColumnWork('auth_dept_user', 'deptId', 'bigint', 2);
CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'Id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('basic_export_status', 'remark', 'varchar(2048)', 2);
CALL Pro_Temp_ColumnWork('auth_role', 'isCustomer', 'int', 1);
@ -366,4 +363,9 @@ CALL Pro_Temp_ColumnWork('sync_data_set', 'orderInvoice', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('io_order_invoice', 'id', 'bigint ', 2);
CALL Pro_Temp_ColumnWork('io_order_detail_code', 'regStatus', 'varchar(255) ', 1);

Write Preview
Loading…
Cancel
Save