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

同步相关问题修改。用户选入物资字典相关修改

Browse Source
master
anthonywj 2 years ago
parent 79c64f15f1
commit 75077b05a4
20 changed files with 282 additions and 199 deletions
Show Stats Download Patch File Download Diff File

7
src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java
Unescape Escape View File

@ -47,6 +47,13 @@ public enum BasicExportTypeEnum {
*/ */
IO_ORDER("io_order", "单据信息"), IO_ORDER("io_order", "单据信息"),
/**
* 发票信息
*/
ORDER_INVOICE("io_order_invoice", "扫码单据发票信息"),
// //
// NEW_ALL_ORDER("all_order", "出入库扫码单据"), // NEW_ALL_ORDER("all_order", "出入库扫码单据"),
// ALL_BUS_ORDER("all_bus_order", "业务单据"), // ALL_BUS_ORDER("all_bus_order", "业务单据"),

1
src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java
Unescape Escape View File

@ -52,7 +52,6 @@ public class IoOrderInvoiceController {
fileService.download(syncFiles); fileService.download(syncFiles);
} }
} }
return ResultVOUtils.success("更新成功！"); return ResultVOUtils.success("更新成功！");
} else } else
return baseResponse; return baseResponse;

29
src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
Unescape Escape View File

@ -137,6 +137,9 @@ public class IoOrderReviewController extends BaseController {
transferOrder(orderEntity, entrustReceEntity); transferOrder(orderEntity, entrustReceEntity);
} }
} }
if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP)
spGetHttp.reviewOrder(updateExportStatusRequest);
return updateReview(getUser(), orderEntity); return updateReview(getUser(), orderEntity);
} else if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) { } else if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) {
return thirdUpdateReview(getUser(), orderEntity); return thirdUpdateReview(getUser(), orderEntity);
@ -452,7 +455,6 @@ public class IoOrderReviewController extends BaseController {
String errMsg = checkReviewAuth(billNo, userId + ""); String errMsg = checkReviewAuth(billNo, userId + "");
EntrustReceEntity entrustReceEntity; EntrustReceEntity entrustReceEntity;
if (StrUtil.isNotEmpty(errMsg)) { if (StrUtil.isNotEmpty(errMsg)) {
if (errMsg.equals("委托验收")) { if (errMsg.equals("委托验收")) {
IoOrderEntity orderEntity = orderService.findByBillNo(billNo); IoOrderEntity orderEntity = orderService.findByBillNo(billNo);
entrustReceEntity = entrustReceService.findByUnique(orderEntity.getAction(), userId); entrustReceEntity = entrustReceService.findByUnique(orderEntity.getAction(), userId);
@ -493,12 +495,19 @@ public class IoOrderReviewController extends BaseController {
orderEntity = orderEntities.get(0); orderEntity = orderEntities.get(0);
orderEntity.setUpdateTime(null); orderEntity.setUpdateTime(null);
orderEntity.setFromType(ConstantStatus.FROM_UDISP); orderEntity.setFromType(ConstantStatus.FROM_UDISP);
orderEntity.setReviewSp(true);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo()); IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo());
if (temp == null) { if (temp == null) {
orderEntity.setId(null); orderEntity.setId(null);
orderService.insertOrder(orderEntity); orderService.insertOrder(orderEntity);
heartService.insetOrderDb(spsSyncOrderResponse, orderEntity); heartService.insetOrderDb(spsSyncOrderResponse, orderEntity);
orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
addInoutService.dealProcess(orderEntity);
orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) {
ioCheckInoutService.check(orderEntity.getBillNo());
}
} }
FilterOrderDetailResultRequest tempRequest = new FilterOrderDetailResultRequest(); FilterOrderDetailResultRequest tempRequest = new FilterOrderDetailResultRequest();
tempRequest.setOrderIdFk(billNo); tempRequest.setOrderIdFk(billNo);
@ -518,12 +527,30 @@ public class IoOrderReviewController extends BaseController {
return ResultVOUtils.success(acceptOrderEntity); return ResultVOUtils.success(acceptOrderEntity);
} }
@Resource
IoAddInoutService addInoutService;
@Resource @Resource
InvBusUserService invBusUserService; InvBusUserService invBusUserService;
//校验用户是否验收权限 //校验用户是否验收权限
private String checkReviewAuth(String orderId, String userId) { private String checkReviewAuth(String orderId, String userId) {
IoOrderEntity orderEntity = orderService.findByBillNo(orderId); IoOrderEntity orderEntity = orderService.findByBillNo(orderId);
if (orderEntity == null) {
ReviewSpmsRequest reviewSpmsRequest = new ReviewSpmsRequest();
reviewSpmsRequest.setBillNo(orderId);
BaseResponse<IoOrderEntity> response = spGetHttp.getSimpleOrder(reviewSpmsRequest, userId);
if (response.getCode() == 20000 && response.getData() != null) {
orderEntity = response.getData();
} else {
return "单据不存在！";
}
}
if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW && orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) { if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW && orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) {
return "单据非未验收状态,无法审核！"; return "单据非未验收状态,无法审核！";
} }

6
src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java
Unescape Escape View File

@ -66,13 +66,15 @@ public class SyncDataSetController {
syncDataSetEntity.setId(1); syncDataSetEntity.setId(1);
List<SyncDataBustypeEntity> busTypes = syncDataSetResponse.getBusTypes(); List<SyncDataBustypeEntity> busTypes = syncDataSetResponse.getBusTypes();
syncDataBustypeService.deleteAll(1); syncDataBustypeService.deleteAll(1);
if (CollUtil.isNotEmpty(busTypes)) if (CollUtil.isNotEmpty(busTypes)) {
syncDataBustypeService.inserts(busTypes); syncDataBustypeService.inserts(busTypes);
}
List<SyncDataBustypeEntity> toInBusTypes = syncDataSetResponse.getToInBusTypes(); List<SyncDataBustypeEntity> toInBusTypes = syncDataSetResponse.getToInBusTypes();
syncDataBustypeService.deleteAll(2); syncDataBustypeService.deleteAll(2);
if (CollUtil.isNotEmpty(toInBusTypes)) if (CollUtil.isNotEmpty(toInBusTypes)) {
syncDataBustypeService.inserts(toInBusTypes); syncDataBustypeService.inserts(toInBusTypes);
}
if (CollUtil.isNotEmpty(syncDataSetResponse.getChangeBusTypes())) { if (CollUtil.isNotEmpty(syncDataSetResponse.getChangeBusTypes())) {

2
src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
Unescape Escape View File

@ -79,7 +79,7 @@ public class UdiProductEntity {
private String supId; private String supId;
private Integer relSupId; private Long relSupId;
public Boolean getAllowNoBatch() { public Boolean getAllowNoBatch() {

2
src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java
Unescape Escape View File

@ -195,6 +195,8 @@ public class IoOrderEntity {
@TableField(value = "entrustEnd") @TableField(value = "entrustEnd")
private boolean entrustEnd; private boolean entrustEnd;
@TableField(value = "reviewSp")
private boolean reviewSp; //是否验收外网单据时，需忽略流转更改为待审核
/** /**

14
src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java
Unescape Escape View File

@ -10,6 +10,7 @@ import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BasicExportTypeEnum; import com.glxp.api.constant.BasicExportTypeEnum;
import com.glxp.api.entity.basic.ProductInfoEntity; import com.glxp.api.entity.basic.ProductInfoEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.inout.IoOrderInvoiceEntity; import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusEntity;
import com.glxp.api.entity.sync.IOOrderStatusEntity; import com.glxp.api.entity.sync.IOOrderStatusEntity;
@ -125,6 +126,19 @@ public class SpGetHttpClient {
} }
public BaseResponse<IoOrderEntity> getSimpleOrder(ReviewSpmsRequest reviewSpmsRequest, String userId) {
String json = JSONUtil.toJsonStr(reviewSpmsRequest);
List<String> header = (List<String>) Convert.toList(buildHeader());
header.add("ADMIN_ID");
header.add(userId);
String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/udiwms/order/getSimpleOrder", json, Convert.toStrArray(header));
BaseResponse<IoOrderEntity> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<IoOrderEntity>>() {
});
return response;
}
public BaseResponse<List<IoOrderInvoiceEntity>> getIoOrderInvoices(RefreshInoiceRequest refreshInoiceRequest) { public BaseResponse<List<IoOrderInvoiceEntity>> getIoOrderInvoices(RefreshInoiceRequest refreshInoiceRequest) {
String json = JSONUtil.toJsonStr(refreshInoiceRequest); String json = JSONUtil.toJsonStr(refreshInoiceRequest);
String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/udiwms/inout/order/refrshInvoice", json, buildHeader()); String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/udiwms/inout/order/refrshInvoice", json, buildHeader());

2
src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java
Unescape Escape View File

@ -5,7 +5,7 @@ import lombok.Data;
@Data @Data
public class CompanyProductRelevanceResponse { public class CompanyProductRelevanceResponse {
private int id; private Long id;
private Integer rlId; private Integer rlId;
private String thirdId; private String thirdId;
private String thirdName; private String thirdName;

3
src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.service.basic.impl; package com.glxp.api.service.basic.impl;
import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
@ -39,6 +40,8 @@ public class CompanyProductRelevanceServiceImpl extends ServiceImpl<CompanyProdu
@Override @Override
public boolean insertCompanyProductRelevance(CompanyProductRelevanceEntity companyProductRelevanceEntity) { public boolean insertCompanyProductRelevance(CompanyProductRelevanceEntity companyProductRelevanceEntity) {
if (companyProductRelevanceEntity.getId() == null)
companyProductRelevanceEntity.setId(IdUtil.getSnowflakeNextId());
return companyProductRelevanceDao.insertCompanyProductRelevance(companyProductRelevanceEntity); return companyProductRelevanceDao.insertCompanyProductRelevance(companyProductRelevanceEntity);
} }

4
src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.service.basic.impl; package com.glxp.api.service.basic.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.basic.UdiProductDao; import com.glxp.api.dao.basic.UdiProductDao;
@ -96,6 +97,9 @@ public class UdiProductServiceImpl implements UdiProductService {
@Override @Override
public boolean insertUdiInfo(UdiProductEntity udiProductEntity) { public boolean insertUdiInfo(UdiProductEntity udiProductEntity) {
if (udiProductEntity.getId() == null) {
udiProductEntity.setId(IdUtil.getSnowflakeNextId());
}
return udiProductDao.insertUdiInfo(udiProductEntity); return udiProductDao.insertUdiInfo(udiProductEntity);
} }

14
src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.glxp.api.service.inout;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.UUID; import cn.hutool.core.lang.UUID;
import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.Constant; import com.glxp.api.constant.Constant;
@ -187,9 +188,12 @@ public class IoCheckInoutService {
UdiEntity udiEntity = FilterUdiUtils.getUdi(codeEntity.getCode()); UdiEntity udiEntity = FilterUdiUtils.getUdi(codeEntity.getCode());
IoCodeLostEntity codeLostEntity = codeLostService.findByCode(codeEntity.getCode()); IoCodeLostEntity codeLostEntity = codeLostService.findByCode(codeEntity.getCode());
if (codeLostEntity == null) if (codeLostEntity == null) {
codeLostEntity = new IoCodeLostEntity(); codeLostEntity = new IoCodeLostEntity();
codeLostEntity.setId(IdUtil.getSnowflakeNextId());
codeLostEntity.setNameCode(udiEntity.getUdi());
codeLostEntity.setCode(codeEntity.getCode());
}
//校验是否写入缺失表 //校验是否写入缺失表
boolean isTrue = false; boolean isTrue = false;
if (udiEntity != null) { if (udiEntity != null) {
@ -211,8 +215,10 @@ public class IoCheckInoutService {
isTrue = true; isTrue = true;
} }
} }
if (isTrue) if (isTrue) {
codeLostEntity.setCreateTime(new Date());
codeLostService.insertOrUpdate(codeLostEntity); codeLostService.insertOrUpdate(codeLostEntity);
}
} }
} }
@ -777,7 +783,7 @@ public class IoCheckInoutService {
if (!bussinessTypeEntity.isSecCheckCopy()) { if (!bussinessTypeEntity.isSecCheckCopy()) {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED);
} }
} else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDISP) { } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDISP && !orderEntity.isReviewSp()) {
if (!bussinessTypeEntity.isSecCheckSp()) { if (!bussinessTypeEntity.isSecCheckSp()) {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED);
} }

2
src/main/java/com/glxp/api/service/sync/SyncDataBustypeService.java
Unescape Escape View File

@ -14,4 +14,6 @@ public interface SyncDataBustypeService extends IService<SyncDataBustypeEntity>
void inserts(List<SyncDataBustypeEntity> syncDataBustypeEntities); void inserts(List<SyncDataBustypeEntity> syncDataBustypeEntities);
boolean isExits(List<SyncDataBustypeEntity> syncDataBustypeEntities, Integer direct);
} }

8
src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java
Unescape Escape View File

@ -13,7 +13,7 @@ import java.util.List;
@Service @Service
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public class SyncDataBustypeServiceImpl extends ServiceImpl<SyncDataBustypeDao,SyncDataBustypeEntity> implements SyncDataBustypeService { public class SyncDataBustypeServiceImpl extends ServiceImpl<SyncDataBustypeDao, SyncDataBustypeEntity> implements SyncDataBustypeService {
@Resource @Resource
SyncDataBustypeDao syncDataBustypeDao; SyncDataBustypeDao syncDataBustypeDao;
@ -32,4 +32,10 @@ public class SyncDataBustypeServiceImpl extends ServiceImpl<SyncDataBustypeDao,S
public void inserts(List<SyncDataBustypeEntity> syncDataBustypeEntities) { public void inserts(List<SyncDataBustypeEntity> syncDataBustypeEntities) {
syncDataBustypeDao.inserts(syncDataBustypeEntities); syncDataBustypeDao.inserts(syncDataBustypeEntities);
} }
@Override
public boolean isExits(List<SyncDataBustypeEntity> syncDataBustypeEntities, Integer direct) {
//
return false;
}
} }

2
src/main/java/com/glxp/api/util/DateUtil.java
Unescape Escape View File

@ -61,7 +61,7 @@ public class DateUtil extends DateUtils {
* 得到日期时间字符串，转换格式（yyyy-MM-dd HH:mm:ss） * 得到日期时间字符串，转换格式（yyyy-MM-dd HH:mm:ss）
*/ */
public static String formatDateTime(Date date) { public static String formatDateTime(Date date) {
Date currentTime = new Date(); Date currentTime = date;
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String dateString = formatter.format(currentTime); String dateString = formatter.format(currentTime);
return dateString; return dateString;

4
src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.glxp.api.util.udi; package com.glxp.api.util.udi;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.basic.UdiProductEntity;
@ -26,6 +27,9 @@ public class UdiInfoUtil {
public static List<UdiProductEntity> initUdiInfoEntitys(List<UdiProductEntity> udiProductEntities) { public static List<UdiProductEntity> initUdiInfoEntitys(List<UdiProductEntity> udiProductEntities) {
if (CollUtil.isNotEmpty(udiProductEntities)) { if (CollUtil.isNotEmpty(udiProductEntities)) {
for (UdiProductEntity udiProductEntity : udiProductEntities) { for (UdiProductEntity udiProductEntity : udiProductEntities) {
if (udiProductEntity.getId() == null) {
udiProductEntity.setId(IdUtil.getSnowflakeNextId());
}
udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI); udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI);
if (StrUtil.isNotEmpty(udiProductEntity.getScbssfbhph()) && "否".equals(udiProductEntity.getScbssfbhph())) { if (StrUtil.isNotEmpty(udiProductEntity.getScbssfbhph()) && "否".equals(udiProductEntity.getScbssfbhph())) {
udiProductEntity.setAllowNoBatch(true); udiProductEntity.setAllowNoBatch(true);

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

@ -5,10 +5,10 @@
<insert id="insertCompanyProductRelevance" <insert id="insertCompanyProductRelevance"
parameterType="com.glxp.api.entity.basic.CompanyProductRelevanceEntity"> parameterType="com.glxp.api.entity.basic.CompanyProductRelevanceEntity">
replace replace
INTO company_product_relevance(customerId, productId, enterpriseId, registrationId, INTO company_product_relevance(id, customerId, productId, enterpriseId, registrationId,
createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk, createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk,
price) price)
values (#{customerId}, values (#{id}, #{customerId},
#{productId}, #{productId},
#{enterpriseId}, #{enterpriseId},
#{registrationId}, #{registrationId},

366
src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
Unescape Escape View File

@ -31,66 +31,66 @@
<select id="filterUdiInfo2" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest" <select id="filterUdiInfo2" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
resultType="com.glxp.api.res.basic.UdiRelevanceResponse"> resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
SELECT basic_products.id, SELECT basic_products.id,
basic_udirel.thirdId, basic_udirel.thirdId,
basic_udirel.thirdName, basic_udirel.thirdName,
basic_udirel.isUseDy, basic_udirel.isUseDy,
basic_udirel.thirdId1, basic_udirel.thirdId1,
basic_udirel.thirdId2, basic_udirel.thirdId2,
basic_udirel.thirdId3, basic_udirel.thirdId3,
basic_udirel.thirdId4, basic_udirel.thirdId4,
basic_udirel.ybbm, basic_udirel.ybbm,
basic_udirel.sptm, basic_udirel.sptm,
basic_udirel.isDisable, basic_udirel.isDisable,
basic_udirel.thirdName1, basic_udirel.thirdName1,
basic_udirel.thirdName2, basic_udirel.thirdName2,
basic_udirel.thirdName3, basic_udirel.thirdName3,
basic_udirel.thirdName4, basic_udirel.thirdName4,
basic_udirel.manufactory, basic_udirel.manufactory,
basic_udirel.measname, basic_udirel.measname,
basic_udirel.udplatCode, basic_udirel.udplatCode,
basic_products.nameCode, basic_products.nameCode,
basic_products.packRatio, basic_products.packRatio,
basic_products.packLevel, basic_products.packLevel,
basic_products.packUnit, basic_products.packUnit,
basic_products.bhxjsl, basic_products.bhxjsl,
basic_products.bhzxxsbzsl, basic_products.bhzxxsbzsl,
basic_products.zxxsbzbhsydysl, basic_products.zxxsbzbhsydysl,
basic_products.bhxjcpbm, basic_products.bhxjcpbm,
basic_products.bzcj, basic_products.bzcj,
basic_products.addType, basic_products.addType,
basic_products.deviceRecordKey, basic_products.deviceRecordKey,
basic_products.cpmctymc, basic_products.cpmctymc,
basic_products.cplb, basic_products.cplb,
basic_products.flbm, basic_products.flbm,
basic_products.ggxh, basic_products.ggxh,
basic_products.qxlb, basic_products.qxlb,
basic_products.tyshxydm, basic_products.tyshxydm,
basic_products.ylqxzcrbarmc, basic_products.ylqxzcrbarmc,
basic_products.zczbhhzbapzbh, basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc, basic_products.ylqxzcrbarywmc,
basic_products.sydycpbs, basic_products.sydycpbs,
basic_products.uuid, basic_products.uuid,
basic_products.sjcpbm, basic_products.sjcpbm,
basic_products.versionNumber, basic_products.versionNumber,
basic_products.diType, basic_products.diType,
basic_products.scbssfbhph, basic_products.scbssfbhph,
basic_products.scbssfbhxlh, basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq, basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq, basic_products.scbssfbhsxrq,
basic_products.cpms, basic_products.cpms,
basic_products.originUuid, basic_products.originUuid,
basic_products.allowNoBatch, basic_products.allowNoBatch,
basic_products.allowNoExpire, basic_products.allowNoExpire,
basic_products.allowNoProduct, basic_products.allowNoProduct,
basic_products.allowNoSerial, basic_products.allowNoSerial,
basic_products.spmc, basic_products.spmc,
basic_products.cplx, basic_products.cplx,
basic_products.hchzsb basic_products.hchzsb
FROM (company_product_relevance FROM (company_product_relevance
inner JOIN basic_udirel inner JOIN basic_udirel
ON company_product_relevance.udiRlIdFk = basic_udirel.id) ON company_product_relevance.udiRlIdFk = basic_udirel.id)
inner JOIN basic_products inner JOIN basic_products
ON basic_udirel.uuid = basic_products.uuid ON basic_udirel.uuid = basic_products.uuid
<where> <where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null"> <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%') AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%')
@ -128,7 +128,6 @@
<if test="originUuid != '' and originUuid != null"> <if test="originUuid != '' and originUuid != null">
AND originUuid = #{originUuid} AND originUuid = #{originUuid}
</if> </if>
</where> </where>
ORDER BY updateTime DESC ORDER BY updateTime DESC
</select> </select>
@ -165,134 +164,134 @@
</select> </select>
<insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.api.entity.basic.UdiProductEntity"> <insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.api.entity.basic.UdiProductEntity">
replace replace
INTO basic_products INTO basic_products
(uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl, (id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl,
zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm,
ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm, ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm,
manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms, manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms,
allowNoBatch, allowNoExpire, allowNoBatch, allowNoExpire,
allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2, allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2,
basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
basicPrductRemak8) basicPrductRemak8)
values (#{uuid}, values (#{id}, #{uuid},
#{originUuid}, #{originUuid},
#{nameCode}, #{nameCode},
#{deviceRecordKey}, #{deviceRecordKey},
#{packRatio}, #{packRatio},
#{packLevel}, #{packLevel},
#{packUnit}, #{packUnit},
#{bhxjsl}, #{bhxjsl},
#{bhzxxsbzsl }, #{bhzxxsbzsl },
#{zxxsbzbhsydysl}, #{zxxsbzbhsydysl},
#{bhxjcpbm}, #{bhxjcpbm},
#{bzcj}, #{bzcj},
#{cpmctymc}, #{cpmctymc},
#{cplb}, #{cplb},
#{flbm}, #{flbm},
#{ggxh}, #{ggxh},
#{qxlb}, #{qxlb},
#{tyshxydm}, #{tyshxydm},
#{ylqxzcrbarmc}, #{ylqxzcrbarmc},
#{zczbhhzbapzbh}, #{zczbhhzbapzbh},
#{ylqxzcrbarywmc}, #{ylqxzcrbarywmc},
#{sydycpbs}, #{sydycpbs},
#{sjcpbm}, #{sjcpbm},
#{versionNumber}, #{versionNumber},
#{diType}, #{diType},
#{ybbm}, #{ybbm},
#{sptm}, #{sptm},
#{manufactory}, #{manufactory},
#{measname}, #{measname},
#{productType}, #{productType},
#{scbssfbhph}, #{scbssfbhph},
#{scbssfbhxlh}, #{scbssfbhxlh},
#{scbssfbhscrq}, #{scbssfbhscrq},
#{scbssfbhsxrq}, #{scbssfbhsxrq},
#{cpms}, #{cpms},
#{allowNoBatch}, #{allowNoBatch},
#{allowNoExpire}, #{allowNoExpire},
#{allowNoProduct}, #{allowNoSerial}, #{allowNoProduct}, #{allowNoSerial},
#{spmc}, #{spmc},
#{cplx}, #{cplx},
#{hchzsb}, #{hchzsb},
#{cpdls}, #{cpdls},
#{price}, #{price},
#{basicPrductRemak1}, #{basicPrductRemak1},
#{basicPrductRemak2}, #{basicPrductRemak2},
#{basicPrductRemak3}, #{basicPrductRemak3},
#{basicPrductRemak4}, #{basicPrductRemak4},
#{basicPrductRemak5}, #{basicPrductRemak5},
#{basicPrductRemak6}, #{basicPrductRemak6},
#{basicPrductRemak7}, #{basicPrductRemak7},
#{basicPrductRemak8}) #{basicPrductRemak8})
</insert> </insert>
<insert id="insertUdiInfos" keyProperty="id" parameterType="java.util.List"> <insert id="insertUdiInfos" keyProperty="id" parameterType="java.util.List">
replace INTO basic_products replace INTO basic_products
(id,uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl, (id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl,
zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm,
ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm, ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm,
manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms, manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms,
allowNoBatch, allowNoExpire, allowNoBatch, allowNoExpire,
allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2, allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2,
basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
basicPrductRemak8) basicPrductRemak8)
values values
<foreach collection="udiInfoEntities" item="item" index="index" <foreach collection="udiInfoEntities" item="item" index="index"
separator=","> separator=",">
(#{item.id}, (#{item.id},
#{item.uuid}, #{item.uuid},
#{item.originUuid}, #{item.originUuid},
#{item.nameCode}, #{item.nameCode},
#{item.deviceRecordKey}, #{item.deviceRecordKey},
#{item.packRatio}, #{item.packRatio},
#{item.packLevel}, #{item.packLevel},
#{item.packUnit}, #{item.packUnit},
#{item.bhxjsl}, #{item.bhxjsl},
#{item.bhzxxsbzsl}, #{item.bhzxxsbzsl},
#{item.zxxsbzbhsydysl}, #{item.zxxsbzbhsydysl},
#{item.bhxjcpbm}, #{item.bhxjcpbm},
#{item.bzcj}, #{item.bzcj},
#{item.cpmctymc}, #{item.cpmctymc},
#{item.cplb}, #{item.cplb},
#{item.flbm}, #{item.flbm},
#{item.ggxh}, #{item.ggxh},
#{item.qxlb}, #{item.qxlb},
#{item.tyshxydm}, #{item.tyshxydm},
#{item.ylqxzcrbarmc}, #{item.ylqxzcrbarmc},
#{item.zczbhhzbapzbh}, #{item.zczbhhzbapzbh},
#{item.ylqxzcrbarywmc}, #{item.ylqxzcrbarywmc},
#{item.sydycpbs}, #{item.sydycpbs},
#{item.sjcpbm}, #{item.sjcpbm},
#{item.versionNumber}, #{item.versionNumber},
#{item.diType}, #{item.diType},
#{item.ybbm}, #{item.ybbm},
#{item.sptm}, #{item.sptm},
#{item.manufactory}, #{item.manufactory},
#{item.measname}, #{item.measname},
#{item.productType}, #{item.productType},
#{item.scbssfbhph}, #{item.scbssfbhph},
#{item.scbssfbhxlh}, #{item.scbssfbhxlh},
#{item.scbssfbhscrq}, #{item.scbssfbhscrq},
#{item.scbssfbhsxrq}, #{item.scbssfbhsxrq},
#{item.cpms}, #{item.cpms},
#{item.allowNoBatch}, #{item.allowNoBatch},
#{item.allowNoExpire}, #{item.allowNoExpire},
#{item.allowNoProduct}, #{item.allowNoSerial}, #{item.allowNoProduct}, #{item.allowNoSerial},
#{item.spmc}, #{item.spmc},
#{item.cplx}, #{item.cplx},
#{item.hchzsb}, #{item.hchzsb},
#{item.cpdls}, #{item.cpdls},
#{item.price}, #{item.price},
#{item.basicPrductRemak1}, #{item.basicPrductRemak1},
#{item.basicPrductRemak2}, #{item.basicPrductRemak2},
#{item.basicPrductRemak3}, #{item.basicPrductRemak3},
#{item.basicPrductRemak4}, #{item.basicPrductRemak4},
#{item.basicPrductRemak5}, #{item.basicPrductRemak5},
#{item.basicPrductRemak6}, #{item.basicPrductRemak6},
#{item.basicPrductRemak7}, #{item.basicPrductRemak7},
#{item.basicPrductRemak8}) #{item.basicPrductRemak8})
</foreach> </foreach>
</insert> </insert>
@ -468,7 +467,7 @@
</if> </if>
</trim> </trim>
WHERE nameCode = #{nameCode} WHERE nameCode = #{nameCode}
and uuid = #{uuid} and uuid = #{uuid}
</update> </update>
<update id="updateUdiInfoByUuid" parameterType="com.glxp.api.entity.basic.UdiProductEntity"> <update id="updateUdiInfoByUuid" parameterType="com.glxp.api.entity.basic.UdiProductEntity">
@ -818,7 +817,7 @@
<select id="selectGgxhList" resultType="java.lang.String"> <select id="selectGgxhList" resultType="java.lang.String">
select distinct ggxh select distinct ggxh
from basic_products from basic_products
left join basic_udirel on basic_products.uuid = basic_udirel.uuid left join basic_udirel on basic_products.uuid = basic_udirel.uuid
where basic_udirel.id = #{relId} where basic_udirel.id = #{relId}
</select> </select>
@ -957,6 +956,9 @@
</update> </update>
<select id="selectAllowNoBatch" resultType="com.glxp.api.entity.basic.UdiProductEntity"> <select id="selectAllowNoBatch" resultType="com.glxp.api.entity.basic.UdiProductEntity">
select id, allowNoBatch from basic_products where nameCode = #{nameCode} limit 1 select id, allowNoBatch
from basic_products
where nameCode = #{nameCode}
limit 1
</select> </select>
</mapper> </mapper>

2
src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml
Unescape Escape View File

@ -10,7 +10,7 @@
<insert id="inserts" parameterType="com.glxp.api.entity.system.SyncDataBustypeEntity" useGeneratedKeys="true"> <insert id="inserts" parameterType="com.glxp.api.entity.system.SyncDataBustypeEntity" useGeneratedKeys="true">
insert INTO sync_data_bustypes replace INTO sync_data_bustypes
(id, `action`, `name`, outChange, orderStatus, direct) (id, `action`, `name`, outChange, orderStatus, direct)
values values

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

@ -22,7 +22,7 @@
, unCheckCert, checkedCert, companyCert, manufacturerCert, productCert, basicDept , unCheckCert, checkedCert, companyCert, manufacturerCert, productCert, basicDept
, systemConfig , systemConfig
, printConfig, scanChangeConfig, supCert, dbDiCompany, busChangeConfig , printConfig, scanChangeConfig, supCert, dbDiCompany, busChangeConfig
, udiCodeLost, udiCodeRel, orderInvoice) , udiCodeLost, udiCodeRel, orderInvoice, orderToInSyncTime, orderSyncDlTime)
values (#{id}, values (#{id},
#{typeBus}, #{typeBus},
#{typeScan}, #{typeScan},
@ -51,6 +51,6 @@
#{unCheckCert}, #{unCheckCert},
#{checkedCert}, #{companyCert}, #{manufacturerCert}, #{productCert}, #{basicDept}, #{checkedCert}, #{companyCert}, #{manufacturerCert}, #{productCert}, #{basicDept},
#{systemConfig}, #{printConfig}, #{scanChangeConfig}, #{supCert}, #{dbDiCompany}, #{busChangeConfig}, #{systemConfig}, #{printConfig}, #{scanChangeConfig}, #{supCert}, #{dbDiCompany}, #{busChangeConfig},
#{udiCodeLost}, #{udiCodeRel}, #{orderInvoice}) #{udiCodeLost}, #{udiCodeRel}, #{orderInvoice}, #{orderToInSyncTime}, #{orderSyncDlTime})
</insert> </insert>
</mapper> </mapper>

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

@ -393,3 +393,8 @@ CALL Pro_Temp_ColumnWork('sup_cert', 'filePath', 'text', 2);
CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'id', 'bigint', 2);
CALL Pro_Temp_ColumnWork('io_order_invoice', 'id', 'bigint ', 2); CALL Pro_Temp_ColumnWork('io_order_invoice', 'id', 'bigint ', 2);
CALL Pro_Temp_ColumnWork('sync_data_set', 'orderInvoice', 'tinyint', 1); CALL Pro_Temp_ColumnWork('sync_data_set', 'orderInvoice', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('io_order', 'regStatus', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('io_order', 'reviewSp', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'regStatus', 'tinyint', 1);

Write Preview
Loading…
Cancel
Save