代码备份

master
anthonyywj2 3 years ago
parent 091f7e0695
commit b129ff7911

@ -97,17 +97,21 @@ public class SpsSyncDownloadService {
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest); List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest);
syncDataResponse.setInvWarehouseEntities(invWarehouseEntities); syncDataResponse.setInvWarehouseEntities(invWarehouseEntities);
//仓库关联单据类型 if (CollUtil.isNotEmpty(invWarehouseEntities)) {
FilterInvBusTypeRequest filterInvBusTypeRequest = new FilterInvBusTypeRequest(); //仓库关联单据类型
BeanUtils.copyProperties(spsSyncDataRequest, filterInvBusTypeRequest); FilterInvBusTypeRequest filterInvBusTypeRequest = new FilterInvBusTypeRequest();
List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeService.filterList(filterInvBusTypeRequest); BeanUtils.copyProperties(spsSyncDataRequest, filterInvBusTypeRequest);
syncDataResponse.setWarehouseBussinessTypeEntities(warehouseBussinessTypeEntities); List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeService.filterList(filterInvBusTypeRequest);
syncDataResponse.setWarehouseBussinessTypeEntities(warehouseBussinessTypeEntities);
//仓库关联用户
FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); //仓库关联用户
BeanUtils.copyProperties(spsSyncDataRequest, filterInvBusTypeRequest); FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest();
List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); BeanUtils.copyProperties(spsSyncDataRequest, filterInvBusTypeRequest);
syncDataResponse.setWarehouseUserEntities(warehouseUserEntities); List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest);
syncDataResponse.setWarehouseUserEntities(warehouseUserEntities);
}
} }
if (syncDataSetEntity.isBasicProducts()) { if (syncDataSetEntity.isBasicProducts()) {
@ -327,9 +331,11 @@ public class SpsSyncDownloadService {
if (syncDataSetEntity.isDbDiProducts()) { if (syncDataSetEntity.isDbDiProducts()) {
ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
BeanUtils.copyProperties(spsSyncDataRequest, productInfoFilterRequest); BeanUtils.copyProperties(spsSyncDataRequest, productInfoFilterRequest);
productInfoFilterRequest.setUpdateTime(spsSyncDataRequest.getLastUpdateTime());
List<ProductInfoEntity> productInfoEntityList = productInfoService.syncDlUdi(productInfoFilterRequest); List<ProductInfoEntity> productInfoEntityList = productInfoService.syncDlUdi(productInfoFilterRequest);
UdiCompanyRequest udiCompanyRequest = new UdiCompanyRequest(); UdiCompanyRequest udiCompanyRequest = new UdiCompanyRequest();
BeanUtils.copyProperties(spsSyncDataRequest, udiCompanyRequest); BeanUtils.copyProperties(spsSyncDataRequest, udiCompanyRequest);
udiCompanyRequest.setUpdateTime(spsSyncDataRequest.getLastUpdateTime());
List<UdiCompanyEntity> udiCompanyEntities = udiCompanyService.syncDlCompany(udiCompanyRequest); List<UdiCompanyEntity> udiCompanyEntities = udiCompanyService.syncDlCompany(udiCompanyRequest);
spSyncUdiResponse.setUdiCompanyEntities(udiCompanyEntities); spSyncUdiResponse.setUdiCompanyEntities(udiCompanyEntities);
spSyncUdiResponse.setProductInfoEntityList(productInfoEntityList); spSyncUdiResponse.setProductInfoEntityList(productInfoEntityList);

@ -224,6 +224,7 @@ public class SpsSyncExportStatusController {
if (basicExportStatusTimeEntity != null) { if (basicExportStatusTimeEntity != null) {
if (StrUtil.isNotEmpty(basicExportStatusRequest.getSyncTime())) if (StrUtil.isNotEmpty(basicExportStatusRequest.getSyncTime()))
basicExportStatusTimeEntity.setLastUpdateTime(basicExportStatusRequest.getSyncTime()); basicExportStatusTimeEntity.setLastUpdateTime(basicExportStatusRequest.getSyncTime());
basicExportTimeService.updateExportStatus(basicExportStatusTimeEntity);
} }
BasicExportStatusEntity basicExportStatusEntity = new BasicExportStatusEntity(); BasicExportStatusEntity basicExportStatusEntity = new BasicExportStatusEntity();
basicExportStatusEntity.setId(CustomUtil.getId()); basicExportStatusEntity.setId(CustomUtil.getId());

@ -5,25 +5,17 @@ import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.TypeReference;
import com.glxp.sale.admin.constant.BasicProcessStatus; import com.glxp.sale.admin.constant.BasicProcessStatus;
import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.dao.auth.AuthAdminDao;
import com.glxp.sale.admin.dao.basic.*; import com.glxp.sale.admin.dao.basic.*;
import com.glxp.sale.admin.dao.info.CompanyProductRelevanceDao; import com.glxp.sale.admin.dao.info.CompanyProductRelevanceDao;
import com.glxp.sale.admin.dao.inout.CodesDao; import com.glxp.sale.admin.dao.inout.*;
import com.glxp.sale.admin.dao.inout.OrderDao; import com.glxp.sale.admin.dao.thrsys.*;
import com.glxp.sale.admin.dao.inout.OrderDetailDao; import com.glxp.sale.admin.entity.auth.AuthAdmin;
import com.glxp.sale.admin.dao.thrsys.ThrCorpDao;
import com.glxp.sale.admin.dao.thrsys.ThrOrderDao;
import com.glxp.sale.admin.dao.thrsys.ThrOrderDetailDao;
import com.glxp.sale.admin.dao.thrsys.ThrProductsDao;
import com.glxp.sale.admin.entity.basic.*; import com.glxp.sale.admin.entity.basic.*;
import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
import com.glxp.sale.admin.entity.inout.ErpOrderEntity; import com.glxp.sale.admin.entity.inout.*;
import com.glxp.sale.admin.entity.inout.OrderEntity;
import com.glxp.sale.admin.entity.inout.WarehouseEntity;
import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.sale.admin.entity.thrsys.ThrCorpEntity; import com.glxp.sale.admin.entity.thrsys.*;
import com.glxp.sale.admin.entity.thrsys.ThrOrderDetailEntity;
import com.glxp.sale.admin.entity.thrsys.ThrOrderEntity;
import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.sale.admin.req.basic.SpsSyncDataRequest; import com.glxp.sale.admin.req.basic.SpsSyncDataRequest;
import com.glxp.sale.admin.res.basic.SpsSyncBusResponse; import com.glxp.sale.admin.res.basic.SpsSyncBusResponse;
import com.glxp.sale.admin.res.basic.SpsSyncDataResponse; import com.glxp.sale.admin.res.basic.SpsSyncDataResponse;
@ -56,13 +48,18 @@ public class SpsSyncUploadController {
@Resource @Resource
SqlSessionFactory sqlSessionFactory; SqlSessionFactory sqlSessionFactory;
@Resource
AuthAdminDao authAdminService;
@Resource @Resource
InvWarehouseService invWarehouseService; InvWarehouseService invWarehouseService;
@Resource @Resource
OrderService orderService; OrderService orderService;
@Resource @Resource
BasicBackUpdateProductService backUpdateProductService; BasicBackUpdateProductService backUpdateProductService;
@Resource
WarehouseUserDao warehouseUserDao;
@Resource
WarehouseBussinessTypeDao warehouseBussinessTypeDao;
@PostMapping("sps/sync/basic/upload") @PostMapping("sps/sync/basic/upload")
public BaseResponse findProductInfo(@RequestBody SpsSyncDataResponse syncDataResponse) { public BaseResponse findProductInfo(@RequestBody SpsSyncDataResponse syncDataResponse) {
@ -172,6 +169,35 @@ public class SpsSyncUploadController {
} }
} }
//第三方仓库信息导入
if (CollUtil.isNotEmpty(syncDataResponse.getThrInvWarehouseEntities())) {
try {
List<ThrInvWarehouseEntity> thrInvWarehouseEntities = syncDataResponse.getThrInvWarehouseEntities();
ThrInvWarehouseDao mapper = batchSession.getMapper(ThrInvWarehouseDao.class);
for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrInvWarehouseEntities) {
thrInvWarehouseEntity.setUpdateTime(null);
mapper.insertThrInvWarehouse(thrInvWarehouseEntity);
}
batchSession.commit();
} catch (Exception e) {
}
}
//仓库用户表
if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseUserEntities())) {
for (WarehouseUserEntity warehouseUserEntity : syncDataResponse.getWarehouseUserEntities()) {
warehouseUserDao.insertOrUpdate(warehouseUserEntity);
}
}
//仓库单据类型表
if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseBussinessTypeEntities())) {
for (WarehouseBussinessTypeEntity warehouseUserEntity : syncDataResponse.getWarehouseBussinessTypeEntities()) {
warehouseBussinessTypeDao.insertOrUpdate(warehouseUserEntity);
}
}
//第三方产品信息导入 //第三方产品信息导入
if (CollUtil.isNotEmpty(syncDataResponse.getThrProductsEntities())) { if (CollUtil.isNotEmpty(syncDataResponse.getThrProductsEntities())) {
@ -230,6 +256,17 @@ public class SpsSyncUploadController {
} catch (Exception e) { } catch (Exception e) {
} }
} }
//用户表
if (CollUtil.isNotEmpty(syncDataResponse.getAuthAdminList())) {
for (AuthAdmin authAdmin : syncDataResponse.getAuthAdminList()) {
authAdmin.setLastModifyTime(null);
authAdmin.setCustomerId(110);
authAdminService.replaceAuthAdmin(authAdmin);
}
}
// batchSession.clearCache(); // batchSession.clearCache();
batchSession.close(); batchSession.close();
} }
@ -298,36 +335,55 @@ public class SpsSyncUploadController {
orderEntity.setUpdateTime(null); orderEntity.setUpdateTime(null);
orderEntity.setFromType(ConstantStatus.FROM_UDIWMS); orderEntity.setFromType(ConstantStatus.FROM_UDIWMS);
orderEntity.setReceiveStatus(0); orderEntity.setReceiveStatus(0);
orderEntity.setErpFk(null);
orderEntity.setOutChangeEnable(false);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
orderService.deleteByOrderId(orderEntity.getId());
mapper.importOrder(orderEntity); OrderEntity temp = orderService.findById(orderEntity.getId());
} if (temp == null) {
batchSession.commit(); mapper.importOrder(orderEntity);
} catch (Exception e) { if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseEntityList())) {
} try {
} CodesTempDao codeMappert = batchSession.getMapper(CodesTempDao.class);
if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailEntityList())) { List<WarehouseEntity> warehouseEntityList = syncDataResponse.getWarehouseEntityList();
try { for (WarehouseEntity warehouseEntity : warehouseEntityList) {
List<ErpOrderEntity> erpOrderEntities = syncDataResponse.getOrderDetailEntityList(); if (warehouseEntity.getOrderId().equals(orderEntity.getId())) {
OrderDetailDao mapper = batchSession.getMapper(OrderDetailDao.class); codeMappert.replaceCodesTempSingle(warehouseEntity);
for (ErpOrderEntity erpOrderEntity : erpOrderEntities) { }
mapper.insertErpOrder(erpOrderEntity); }
} batchSession.commit();
batchSession.commit(); } catch (Exception e) {
} catch (Exception e) { }
} }
} }
if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseEntityList())) {
try {
List<WarehouseEntity> warehouseEntityList = syncDataResponse.getWarehouseEntityList();
CodesDao mapper = batchSession.getMapper(CodesDao.class);
for (WarehouseEntity warehouseEntity : warehouseEntityList) {
mapper.insertWarehouse(warehouseEntity);
} }
batchSession.commit(); batchSession.commit();
} catch (Exception e) { } catch (Exception e) {
} }
} }
// if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailEntityList())) {
// try {
// List<ErpOrderEntity> erpOrderEntities = syncDataResponse.getOrderDetailEntityList();
// OrderDetailDao mapper = batchSession.getMapper(OrderDetailDao.class);
// for (ErpOrderEntity erpOrderEntity : erpOrderEntities) {
// mapper.insertErpOrder(erpOrderEntity);
// }
// batchSession.commit();
// } catch (Exception e) {
// }
// }
// if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseEntityList())) {
// try {
// List<WarehouseEntity> warehouseEntityList = syncDataResponse.getWarehouseEntityList();
// CodesDao mapper = batchSession.getMapper(CodesDao.class);
// for (WarehouseEntity warehouseEntity : warehouseEntityList) {
// mapper.insertWarehouse(warehouseEntity);
// }
// batchSession.commit();
// } catch (Exception e) {
// }
// }
batchSession.close(); batchSession.close();
} }

@ -437,6 +437,18 @@ public class WareHouseController {
UdiEntity udiEntity = FilterUdiUtils.getUdi(code); UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
if (udiEntity == null) { if (udiEntity == null) {
String sptmtodi = systemParamConfigService.selectValueByParamKey(Constant.SPTM_TO_DI);
if(sptmtodi.equals("1")){
if (code.length() == 13) {
UdiInfoEntity udiInfoEntity = udiInfoService.findBySptm(code);
if (udiInfoEntity != null) {
BaseResponse baseResponse = ResultVOUtils.error(508, "商品条码");
baseResponse.setData(udiInfoEntity);
return baseResponse;
}
}
}
BaseResponse baseResponse = ResultVOUtils.error(501, "UDI码格式错误"); BaseResponse baseResponse = ResultVOUtils.error(501, "UDI码格式错误");
baseResponse.setData(originCode); baseResponse.setData(originCode);
return baseResponse; return baseResponse;
@ -881,7 +893,9 @@ public class WareHouseController {
//校验条码的完整性 //校验条码的完整性
String errMsg = ""; String errMsg = "";
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
if(udiRelevanceResponse == null){
return ResultVOUtils.error(501, "耗材字典不存在此产品!");
}
if (StrUtil.isEmpty(udiEntity.getBatchNo()) && !udiRelevanceResponse.isAllowNoBatch()) { if (StrUtil.isEmpty(udiEntity.getBatchNo()) && !udiRelevanceResponse.isAllowNoBatch()) {
errMsg = errMsg + ",批次号"; errMsg = errMsg + ",批次号";
} }

@ -17,6 +17,8 @@ public interface AuthAdminDao {
*/ */
List<AuthAdmin> listAdminPage(AuthAdminQueryRequest authAdminQueryRequest); List<AuthAdmin> listAdminPage(AuthAdminQueryRequest authAdminQueryRequest);
boolean replaceAuthAdmin(AuthAdmin authAdmin);
/** /**
* id * id
* *

@ -12,6 +12,9 @@ public interface UdiInfoService {
List<UdiInfoEntity> filterUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest); List<UdiInfoEntity> filterUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest);
UdiInfoEntity findBySptm(String sptm);
List<UdiRelevanceResponse> filterUdiInfo2(FilterUdiInfoRequest filterUdiInfoRequest); List<UdiRelevanceResponse> filterUdiInfo2(FilterUdiInfoRequest filterUdiInfoRequest);
List<UdiInfoEntity> filterAllUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest); List<UdiInfoEntity> filterAllUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest);

@ -1,8 +1,10 @@
package com.glxp.sale.admin.service.basic.impl; package com.glxp.sale.admin.service.basic.impl;
import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.glxp.sale.admin.dao.basic.UdiInfoDao; import com.glxp.sale.admin.dao.basic.UdiInfoDao;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest; import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiInfoService;
@ -24,7 +26,7 @@ public class UdiInfoServiceImpl implements UdiInfoService {
if (filterUdiInfoRequest == null) { if (filterUdiInfoRequest == null) {
return Collections.emptyList(); return Collections.emptyList();
} }
if(filterUdiInfoRequest.getPage()!=null){ if (filterUdiInfoRequest.getPage() != null) {
int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit(); int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit();
PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit()); PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit());
} }
@ -33,6 +35,17 @@ public class UdiInfoServiceImpl implements UdiInfoService {
return data; return data;
} }
@Override
public UdiInfoEntity findBySptm(String sptm) {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setSptm(sptm);
List<UdiInfoEntity> data = udiInfoDao.filterUdiInfo(filterUdiInfoRequest);
if (CollUtil.isNotEmpty(data)) {
return data.get(0);
}
return null;
}
@Override @Override
public List<UdiRelevanceResponse> filterUdiInfo2(FilterUdiInfoRequest filterUdiInfoRequest) { public List<UdiRelevanceResponse> filterUdiInfo2(FilterUdiInfoRequest filterUdiInfoRequest) {
if (filterUdiInfoRequest == null) { if (filterUdiInfoRequest == null) {

@ -125,7 +125,9 @@ public class ProductInfoServiceImpl implements ProductInfoService {
// int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); // int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
// PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit()); // PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
// } // }
int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
productInfoFilterRequest.setPage(offset);
productInfoFilterRequest.setLimit(productInfoFilterRequest.getLimit());
return productInfoDao.syncDlUdi(productInfoFilterRequest); return productInfoDao.syncDlUdi(productInfoFilterRequest);
} }

@ -421,14 +421,16 @@ public class IoTransInoutService {
orderService.updateRemark(orderEntity.getId(), "udi码" + warehouseEntity.getCode() + "当前供应商不存在此配送产品"); orderService.updateRemark(orderEntity.getId(), "udi码" + warehouseEntity.getCode() + "当前供应商不存在此配送产品");
return; return;
} else { } else {
if (StrUtil.isEmpty(warehouseEntity.getRelId())) {
if (datas.size() == 1) { if (datas.size() == 1) {
warehouseEntity.setRelId(datas.get(0).getRlId() + ""); warehouseEntity.setRelId(datas.get(0).getRlId() + "");
} else { } else {
orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL); orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL);
orderService.updateRemark(orderEntity.getId(), "di码" + warehouseEntity.getNameCode() + "DI绑定多个产品ID,请指定对应产品!"); orderService.updateRemark(orderEntity.getId(), "di码" + warehouseEntity.getNameCode() + "DI绑定多个产品ID,请指定对应产品!");
return; return;
}
} }
} }
} }

@ -21,4 +21,6 @@ public class Constant {
public static final String SCAN_ORDER = "ZS"; public static final String SCAN_ORDER = "ZS";
public static final String BUS_ORDER = "ZY"; public static final String BUS_ORDER = "ZY";
public static String SPTM_TO_DI = "sptm_to_di";
} }

@ -31,7 +31,22 @@
ORDER BY id ORDER BY id
DESC DESC
</select> </select>
<insert id="replaceAuthAdmin" keyProperty="id" parameterType="com.glxp.sale.admin.entity.auth.AuthAdmin">
replace
INTO auth_user(id, userName, passWord, lastLoginIp,
lastLoginTime, createTime, userFlag, lastModifyTime, employeeName,CustomerId)
values (
#{id},
#{userName},
#{passWord},
#{lastLoginIp},
#{lastLoginTime},
#{createTime},
#{userFlag,jdbcType=INTEGER},
#{lastModifyTime},
#{employeeName},#{CustomerId}
)
</insert>
<select id="findByUserName" parameterType="hashmap" resultType="com.glxp.sale.admin.entity.auth.AuthAdmin"> <select id="findByUserName" parameterType="hashmap" resultType="com.glxp.sale.admin.entity.auth.AuthAdmin">
SELECT * SELECT *
FROM auth_user FROM auth_user

@ -22,6 +22,9 @@
<if test="originUuid != '' and originUuid != null"> <if test="originUuid != '' and originUuid != null">
AND originUuid = #{originUuid} AND originUuid = #{originUuid}
</if> </if>
<if test="sptm != '' and sptm != null">
AND sptm = #{sptm}
</if>
</where> </where>
</select> </select>

@ -33,7 +33,7 @@
fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus, fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
receiveStatus, erpFk, stockCheckFk, customerId, supId, receiveStatus, erpFk, stockCheckFk, customerId, supId,
exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser, exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
outChangeEnable, originUllageSupNo, preCheck) outChangeEnable, originUllageSupNo, preCheck,updateTime)
values (#{id}, values (#{id},
#{action}, #{action},
#{corpOrderId}, #{corpOrderId},
@ -52,17 +52,18 @@
#{erpFk}, #{erpFk},
#{stockCheckFk}, #{stockCheckFk},
#{customerId}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo}, #{customerId}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo},
#{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck}) #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck},#{updateTime})
</insert> </insert>
<insert id="importOrder" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.OrderEntity"> <insert id="importOrder" keyProperty="id" parameterType="com.glxp.sale.admin.entity.inout.OrderEntity">
replace insert
ignore
INTO io_order(id, action, corpOrderId, actDate, fromCorpId, actor, mainAction, INTO io_order(id, action, corpOrderId, actDate, fromCorpId, actor, mainAction,
fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus, fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
receiveStatus, erpFk, stockCheckFk, customerId, supId, receiveStatus, erpFk, stockCheckFk, customerId, supId,
exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser, exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
outChangeEnable, originUllageSupNo, preCheck) outChangeEnable, originUllageSupNo, preCheck,updateTime)
values (#{id}, values (#{id},
#{action}, #{action},
#{corpOrderId}, #{corpOrderId},
@ -90,7 +91,7 @@
#{reviewUser}, #{reviewUser},
#{outChangeEnable}, #{outChangeEnable},
#{originUllageSupNo}, #{originUllageSupNo},
#{preCheck}) #{preCheck},#{updateTime})
</insert> </insert>

@ -127,7 +127,7 @@
<select id="filterGroupInvWarehouse" parameterType="com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest" <select id="filterGroupInvWarehouse" parameterType="com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest"
resultType="com.glxp.sale.admin.res.inventory.InvWarehouseResponse"> resultType="com.glxp.sale.admin.entity.inventory.InvWarehouseEntity">
SELECT * FROM inv_warehouse SELECT * FROM inv_warehouse
<where> <where>
<if test="id != '' and id != null"> <if test="id != '' and id != null">

@ -75,7 +75,7 @@
</select> </select>
<insert id="insertThrInvWarehouse" keyProperty="id" <insert id="insertThrInvWarehouse" keyProperty="id"
parameterType="com.glxp.sale.admin.entity.thrsys.ThrInvWarehouseEntity"> parameterType="com.glxp.sale.admin.entity.thrsys.ThrInvWarehouseEntity">
insert INTO thr_inv_warehouse replace INTO thr_inv_warehouse
(pid, code, name, advanceType, isDefault, (pid, code, name, advanceType, isDefault,
status, updateTime, remark,thirdSysFk) status, updateTime, remark,thirdSysFk)
values (#{pid}, #{code}, values (#{pid}, #{code},
@ -84,7 +84,7 @@
#{remark},#{thirdSysFk}) #{remark},#{thirdSysFk})
</insert> </insert>
<insert id="insertThrInvWarehouses" parameterType="java.util.List"> <insert id="insertThrInvWarehouses" parameterType="java.util.List">
insert INTO thr_inv_warehouse replace INTO thr_inv_warehouse
(pid, code, name, advanceType, isDefault, (pid, code, name, advanceType, isDefault,
status, updateTime, remark,thirdSysFk) status, updateTime, remark,thirdSysFk)
VALUES VALUES

Loading…
Cancel
Save