From 75077b05a4250521e3749686b73cdc809e9a04d8 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 5 May 2023 19:47:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=9B=B8=E5=85=B3=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82=E7=94=A8=E6=88=B7=E9=80=89?= =?UTF-8?q?=E5=85=A5=E7=89=A9=E8=B5=84=E5=AD=97=E5=85=B8=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/constant/BasicExportTypeEnum.java | 7 + .../inout/IoOrderInvoiceController.java | 1 - .../inout/IoOrderReviewController.java | 29 +- .../sync/SyncDataSetController.java | 6 +- .../api/entity/basic/UdiProductEntity.java | 2 +- .../glxp/api/entity/inout/IoOrderEntity.java | 2 + .../glxp/api/http/sync/SpGetHttpClient.java | 14 + .../CompanyProductRelevanceResponse.java | 2 +- .../CompanyProductRelevanceServiceImpl.java | 3 + .../basic/impl/UdiProductServiceImpl.java | 4 + .../service/inout/IoCheckInoutService.java | 14 +- .../service/sync/SyncDataBustypeService.java | 2 + .../sync/impl/SyncDataBustypeServiceImpl.java | 8 +- src/main/java/com/glxp/api/util/DateUtil.java | 2 +- .../com/glxp/api/util/udi/UdiInfoUtil.java | 4 + .../basic/CompanyProductRelevanceDao.xml | 4 +- .../mybatis/mapper/basic/UdiProductDao.xml | 366 +++++++++--------- .../mapper/system/SyncDataBustypeDao.xml | 2 +- .../mybatis/mapper/system/SyncDataSetDao.xml | 4 +- src/main/resources/schemas/schema_v2.1.sql | 5 + 20 files changed, 282 insertions(+), 199 deletions(-) diff --git a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java index 1eaf23981..34258cd70 100644 --- a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java +++ b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java @@ -47,6 +47,13 @@ public enum BasicExportTypeEnum { */ IO_ORDER("io_order", "单据信息"), + + /** + * 发票信息 + */ + ORDER_INVOICE("io_order_invoice", "扫码单据发票信息"), + + // // NEW_ALL_ORDER("all_order", "出入库扫码单据"), // ALL_BUS_ORDER("all_bus_order", "业务单据"), diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java index 22e5c62bc..71ee8ba3a 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java @@ -52,7 +52,6 @@ public class IoOrderInvoiceController { fileService.download(syncFiles); } } - return ResultVOUtils.success("更新成功！"); } else return baseResponse; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index c4288e722..44c66948d 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -137,6 +137,9 @@ public class IoOrderReviewController extends BaseController { transferOrder(orderEntity, entrustReceEntity); } } + + if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP) + spGetHttp.reviewOrder(updateExportStatusRequest); return updateReview(getUser(), orderEntity); } else if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) { return thirdUpdateReview(getUser(), orderEntity); @@ -452,7 +455,6 @@ public class IoOrderReviewController extends BaseController { String errMsg = checkReviewAuth(billNo, userId + ""); EntrustReceEntity entrustReceEntity; if (StrUtil.isNotEmpty(errMsg)) { - if (errMsg.equals("委托验收")) { IoOrderEntity orderEntity = orderService.findByBillNo(billNo); entrustReceEntity = entrustReceService.findByUnique(orderEntity.getAction(), userId); @@ -493,12 +495,19 @@ public class IoOrderReviewController extends BaseController { orderEntity = orderEntities.get(0); orderEntity.setUpdateTime(null); orderEntity.setFromType(ConstantStatus.FROM_UDISP); + orderEntity.setReviewSp(true); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo()); if (temp == null) { orderEntity.setId(null); orderService.insertOrder(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(); tempRequest.setOrderIdFk(billNo); @@ -518,12 +527,30 @@ public class IoOrderReviewController extends BaseController { return ResultVOUtils.success(acceptOrderEntity); } + @Resource + IoAddInoutService addInoutService; + @Resource InvBusUserService invBusUserService; //校验用户是否验收权限 private String checkReviewAuth(String orderId, String userId) { IoOrderEntity orderEntity = orderService.findByBillNo(orderId); + + + if (orderEntity == null) { + ReviewSpmsRequest reviewSpmsRequest = new ReviewSpmsRequest(); + reviewSpmsRequest.setBillNo(orderId); + BaseResponse 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) { return "单据非未验收状态,无法审核！"; } diff --git a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java index 99d832116..dbf15d44c 100644 --- a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java +++ b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java @@ -66,13 +66,15 @@ public class SyncDataSetController { syncDataSetEntity.setId(1); List busTypes = syncDataSetResponse.getBusTypes(); syncDataBustypeService.deleteAll(1); - if (CollUtil.isNotEmpty(busTypes)) + if (CollUtil.isNotEmpty(busTypes)) { syncDataBustypeService.inserts(busTypes); + } List toInBusTypes = syncDataSetResponse.getToInBusTypes(); syncDataBustypeService.deleteAll(2); - if (CollUtil.isNotEmpty(toInBusTypes)) + if (CollUtil.isNotEmpty(toInBusTypes)) { syncDataBustypeService.inserts(toInBusTypes); + } if (CollUtil.isNotEmpty(syncDataSetResponse.getChangeBusTypes())) { diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java index 24c02c935..cfc6a11fb 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -79,7 +79,7 @@ public class UdiProductEntity { private String supId; - private Integer relSupId; + private Long relSupId; public Boolean getAllowNoBatch() { diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java index a288d1b72..b5eaaf711 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java @@ -195,6 +195,8 @@ public class IoOrderEntity { @TableField(value = "entrustEnd") private boolean entrustEnd; + @TableField(value = "reviewSp") + private boolean reviewSp; //是否验收外网单据时，需忽略流转更改为待审核 /** diff --git a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java index f85f07bda..3fb84dd79 100644 --- a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java +++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java @@ -10,6 +10,7 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BasicExportTypeEnum; 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.sync.BasicExportStatusEntity; import com.glxp.api.entity.sync.IOOrderStatusEntity; @@ -125,6 +126,19 @@ public class SpGetHttpClient { } + public BaseResponse getSimpleOrder(ReviewSpmsRequest reviewSpmsRequest, String userId) { + String json = JSONUtil.toJsonStr(reviewSpmsRequest); + List header = (List) Convert.toList(buildHeader()); + header.add("ADMIN_ID"); + header.add(userId); + String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/udiwms/order/getSimpleOrder", json, Convert.toStrArray(header)); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } + + public BaseResponse> getIoOrderInvoices(RefreshInoiceRequest refreshInoiceRequest) { String json = JSONUtil.toJsonStr(refreshInoiceRequest); String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/udiwms/inout/order/refrshInvoice", json, buildHeader()); diff --git a/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java index c123629d1..f9f051b79 100644 --- a/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java @@ -5,7 +5,7 @@ import lombok.Data; @Data public class CompanyProductRelevanceResponse { - private int id; + private Long id; private Integer rlId; private String thirdId; private String thirdName; diff --git a/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java index e5a3192d6..238cfe694 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java @@ -1,6 +1,7 @@ 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.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; @@ -39,6 +40,8 @@ public class CompanyProductRelevanceServiceImpl extends ServiceImpl void inserts(List syncDataBustypeEntities); + boolean isExits(List syncDataBustypeEntities, Integer direct); + } diff --git a/src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java index 9843187b8..3425932d1 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java @@ -13,7 +13,7 @@ import java.util.List; @Service @Transactional(rollbackFor = Exception.class) -public class SyncDataBustypeServiceImpl extends ServiceImpl implements SyncDataBustypeService { +public class SyncDataBustypeServiceImpl extends ServiceImpl implements SyncDataBustypeService { @Resource SyncDataBustypeDao syncDataBustypeDao; @@ -32,4 +32,10 @@ public class SyncDataBustypeServiceImpl extends ServiceImpl syncDataBustypeEntities) { syncDataBustypeDao.inserts(syncDataBustypeEntities); } + + @Override + public boolean isExits(List syncDataBustypeEntities, Integer direct) { +// + return false; + } } diff --git a/src/main/java/com/glxp/api/util/DateUtil.java b/src/main/java/com/glxp/api/util/DateUtil.java index 7025d2498..252b66bd6 100644 --- a/src/main/java/com/glxp/api/util/DateUtil.java +++ b/src/main/java/com/glxp/api/util/DateUtil.java @@ -61,7 +61,7 @@ public class DateUtil extends DateUtils { * 得到日期时间字符串，转换格式（yyyy-MM-dd HH:mm:ss） */ public static String formatDateTime(Date date) { - Date currentTime = new Date(); + Date currentTime = date; SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String dateString = formatter.format(currentTime); return dateString; diff --git a/src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java b/src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java index 5a10803e6..edc68538c 100644 --- a/src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java +++ b/src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java @@ -1,6 +1,7 @@ package com.glxp.api.util.udi; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.basic.UdiProductEntity; @@ -26,6 +27,9 @@ public class UdiInfoUtil { public static List initUdiInfoEntitys(List udiProductEntities) { if (CollUtil.isNotEmpty(udiProductEntities)) { for (UdiProductEntity udiProductEntity : udiProductEntities) { + if (udiProductEntity.getId() == null) { + udiProductEntity.setId(IdUtil.getSnowflakeNextId()); + } udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI); if (StrUtil.isNotEmpty(udiProductEntity.getScbssfbhph()) && "否".equals(udiProductEntity.getScbssfbhph())) { udiProductEntity.setAllowNoBatch(true); diff --git a/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml index 8004250ef..ec4bb3113 100644 --- a/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml @@ -5,10 +5,10 @@ replace - INTO company_product_relevance(customerId, productId, enterpriseId, registrationId, + INTO company_product_relevance(id, customerId, productId, enterpriseId, registrationId, createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk, price) - values (#{customerId}, + values (#{id}, #{customerId}, #{productId}, #{enterpriseId}, #{registrationId}, diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index 8a2886cfb..1b8aa14f5 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -31,66 +31,66 @@ @@ -165,134 +164,134 @@ replace - INTO basic_products - (uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl, - zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, - ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm, - manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms, - allowNoBatch, allowNoExpire, - allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2, - basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, - basicPrductRemak8) - values (#{uuid}, - #{originUuid}, - #{nameCode}, - #{deviceRecordKey}, - #{packRatio}, - #{packLevel}, - #{packUnit}, - #{bhxjsl}, - #{bhzxxsbzsl }, - #{zxxsbzbhsydysl}, - #{bhxjcpbm}, - #{bzcj}, - #{cpmctymc}, - #{cplb}, - #{flbm}, - #{ggxh}, - #{qxlb}, - #{tyshxydm}, - #{ylqxzcrbarmc}, - #{zczbhhzbapzbh}, - #{ylqxzcrbarywmc}, - #{sydycpbs}, - #{sjcpbm}, - #{versionNumber}, - #{diType}, - #{ybbm}, - #{sptm}, - #{manufactory}, - #{measname}, - #{productType}, - #{scbssfbhph}, - #{scbssfbhxlh}, - #{scbssfbhscrq}, - #{scbssfbhsxrq}, - #{cpms}, - #{allowNoBatch}, - #{allowNoExpire}, - #{allowNoProduct}, #{allowNoSerial}, - #{spmc}, - #{cplx}, - #{hchzsb}, - #{cpdls}, - #{price}, - #{basicPrductRemak1}, - #{basicPrductRemak2}, - #{basicPrductRemak3}, - #{basicPrductRemak4}, - #{basicPrductRemak5}, - #{basicPrductRemak6}, - #{basicPrductRemak7}, - #{basicPrductRemak8}) + INTO basic_products + (id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl, + zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, + ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm, + manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms, + allowNoBatch, allowNoExpire, + allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2, + basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, + basicPrductRemak8) + values (#{id}, #{uuid}, + #{originUuid}, + #{nameCode}, + #{deviceRecordKey}, + #{packRatio}, + #{packLevel}, + #{packUnit}, + #{bhxjsl}, + #{bhzxxsbzsl }, + #{zxxsbzbhsydysl}, + #{bhxjcpbm}, + #{bzcj}, + #{cpmctymc}, + #{cplb}, + #{flbm}, + #{ggxh}, + #{qxlb}, + #{tyshxydm}, + #{ylqxzcrbarmc}, + #{zczbhhzbapzbh}, + #{ylqxzcrbarywmc}, + #{sydycpbs}, + #{sjcpbm}, + #{versionNumber}, + #{diType}, + #{ybbm}, + #{sptm}, + #{manufactory}, + #{measname}, + #{productType}, + #{scbssfbhph}, + #{scbssfbhxlh}, + #{scbssfbhscrq}, + #{scbssfbhsxrq}, + #{cpms}, + #{allowNoBatch}, + #{allowNoExpire}, + #{allowNoProduct}, #{allowNoSerial}, + #{spmc}, + #{cplx}, + #{hchzsb}, + #{cpdls}, + #{price}, + #{basicPrductRemak1}, + #{basicPrductRemak2}, + #{basicPrductRemak3}, + #{basicPrductRemak4}, + #{basicPrductRemak5}, + #{basicPrductRemak6}, + #{basicPrductRemak7}, + #{basicPrductRemak8}) replace INTO basic_products - (id,uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl, - zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, - ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm, - manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms, - allowNoBatch, allowNoExpire, - allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2, - basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, - basicPrductRemak8) - values + (id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl, + zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, + ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm, + manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms, + allowNoBatch, allowNoExpire, + allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2, + basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, + basicPrductRemak8) + values (#{item.id}, #{item.uuid}, - #{item.originUuid}, - #{item.nameCode}, - #{item.deviceRecordKey}, - #{item.packRatio}, - #{item.packLevel}, - #{item.packUnit}, - #{item.bhxjsl}, - #{item.bhzxxsbzsl}, - #{item.zxxsbzbhsydysl}, - #{item.bhxjcpbm}, - #{item.bzcj}, - #{item.cpmctymc}, - #{item.cplb}, - #{item.flbm}, - #{item.ggxh}, - #{item.qxlb}, - #{item.tyshxydm}, - #{item.ylqxzcrbarmc}, - #{item.zczbhhzbapzbh}, - #{item.ylqxzcrbarywmc}, - #{item.sydycpbs}, - #{item.sjcpbm}, - #{item.versionNumber}, - #{item.diType}, - #{item.ybbm}, - #{item.sptm}, - #{item.manufactory}, - #{item.measname}, - #{item.productType}, - #{item.scbssfbhph}, - #{item.scbssfbhxlh}, - #{item.scbssfbhscrq}, - #{item.scbssfbhsxrq}, - #{item.cpms}, - #{item.allowNoBatch}, - #{item.allowNoExpire}, - #{item.allowNoProduct}, #{item.allowNoSerial}, - #{item.spmc}, - #{item.cplx}, - #{item.hchzsb}, - #{item.cpdls}, - #{item.price}, - #{item.basicPrductRemak1}, - #{item.basicPrductRemak2}, - #{item.basicPrductRemak3}, - #{item.basicPrductRemak4}, - #{item.basicPrductRemak5}, - #{item.basicPrductRemak6}, - #{item.basicPrductRemak7}, - #{item.basicPrductRemak8}) + #{item.originUuid}, + #{item.nameCode}, + #{item.deviceRecordKey}, + #{item.packRatio}, + #{item.packLevel}, + #{item.packUnit}, + #{item.bhxjsl}, + #{item.bhzxxsbzsl}, + #{item.zxxsbzbhsydysl}, + #{item.bhxjcpbm}, + #{item.bzcj}, + #{item.cpmctymc}, + #{item.cplb}, + #{item.flbm}, + #{item.ggxh}, + #{item.qxlb}, + #{item.tyshxydm}, + #{item.ylqxzcrbarmc}, + #{item.zczbhhzbapzbh}, + #{item.ylqxzcrbarywmc}, + #{item.sydycpbs}, + #{item.sjcpbm}, + #{item.versionNumber}, + #{item.diType}, + #{item.ybbm}, + #{item.sptm}, + #{item.manufactory}, + #{item.measname}, + #{item.productType}, + #{item.scbssfbhph}, + #{item.scbssfbhxlh}, + #{item.scbssfbhscrq}, + #{item.scbssfbhsxrq}, + #{item.cpms}, + #{item.allowNoBatch}, + #{item.allowNoExpire}, + #{item.allowNoProduct}, #{item.allowNoSerial}, + #{item.spmc}, + #{item.cplx}, + #{item.hchzsb}, + #{item.cpdls}, + #{item.price}, + #{item.basicPrductRemak1}, + #{item.basicPrductRemak2}, + #{item.basicPrductRemak3}, + #{item.basicPrductRemak4}, + #{item.basicPrductRemak5}, + #{item.basicPrductRemak6}, + #{item.basicPrductRemak7}, + #{item.basicPrductRemak8}) @@ -468,7 +467,7 @@ WHERE nameCode = #{nameCode} - and uuid = #{uuid} + and uuid = #{uuid} @@ -818,7 +817,7 @@ @@ -957,6 +956,9 @@ diff --git a/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml b/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml index c1e129562..f24f9cc8d 100644 --- a/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml +++ b/src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml @@ -10,7 +10,7 @@ - insert INTO sync_data_bustypes + replace INTO sync_data_bustypes (id, `action`, `name`, outChange, orderStatus, direct) values diff --git a/src/main/resources/mybatis/mapper/system/SyncDataSetDao.xml b/src/main/resources/mybatis/mapper/system/SyncDataSetDao.xml index 3f0674600..bf4cc4f77 100644 --- a/src/main/resources/mybatis/mapper/system/SyncDataSetDao.xml +++ b/src/main/resources/mybatis/mapper/system/SyncDataSetDao.xml @@ -22,7 +22,7 @@ , unCheckCert, checkedCert, companyCert, manufacturerCert, productCert, basicDept , systemConfig , printConfig, scanChangeConfig, supCert, dbDiCompany, busChangeConfig - , udiCodeLost, udiCodeRel, orderInvoice) + , udiCodeLost, udiCodeRel, orderInvoice, orderToInSyncTime, orderSyncDlTime) values (#{id}, #{typeBus}, #{typeScan}, @@ -51,6 +51,6 @@ #{unCheckCert}, #{checkedCert}, #{companyCert}, #{manufacturerCert}, #{productCert}, #{basicDept}, #{systemConfig}, #{printConfig}, #{scanChangeConfig}, #{supCert}, #{dbDiCompany}, #{busChangeConfig}, - #{udiCodeLost}, #{udiCodeRel}, #{orderInvoice}) + #{udiCodeLost}, #{udiCodeRel}, #{orderInvoice}, #{orderToInSyncTime}, #{orderSyncDlTime}) diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 5aac2b887..6e83a6fcb 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -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('io_order_invoice', 'id', 'bigint ', 2); 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);