From 43a7369e64cad4a8ca0aa737653c576b8f99e96b Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Fri, 8 Jul 2022 09:31:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=8F=90=E4=BA=A4=E8=AE=BE=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E=E4=B8=8E?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=85=B3=E8=81=94=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/UdiInfoController.java | 12 +++ .../info/ThirdUploadSetController.java | 57 ++++++++++++++ .../dao/info/SyncUploadDataBustypeDao.java | 19 +++++ .../admin/dao/info/SyncUploadDataSetDao.java | 13 ++++ .../api/admin/entity/basic/UdiInfoEntity.java | 1 + .../entity/info/SyncUploadDataSetEntity.java | 19 +++++ .../admin/req/basic/FilterUdiInfoRequest.java | 2 +- .../admin/res/basic/UdiRelevanceResponse.java | 3 +- .../info/CompanyProductRelevanceResponse.java | 1 + .../info/SyncUploadDataBustypeService.java | 15 ++++ .../info/SyncUploadDataSetService.java | 14 ++++ .../SyncUploadDataBustypeServiceImpl.java | 31 ++++++++ .../impl/SyncUploadDataSetServiceImpl.java | 49 ++++++++++++ .../com/glxp/api/admin/thread/HeartTask.java | 1 - .../api/admin/thread/OrderSubmitTask.java | 75 ++++++++++++++++--- .../basic/CompanyProductRelevanceDao.xml | 1 + .../mybatis/mapper/basic/UdiInfoDao.xml | 2 +- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 2 +- .../mybatis/mapper/business/StockOrderDao.xml | 8 +- .../mapper/info/SyncUploadDataBustypeDao.xml | 33 ++++++++ .../mapper/info/SyncUploadDataSetDao.xml | 28 +++++++ 21 files changed, 364 insertions(+), 22 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/api/admin/controller/info/ThirdUploadSetController.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/info/SyncUploadDataBustypeDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/info/SyncUploadDataSetDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncUploadDataSetEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/info/SyncUploadDataBustypeService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/info/SyncUploadDataSetService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SyncUploadDataBustypeServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SyncUploadDataSetServiceImpl.java create mode 100644 api-admin/src/main/resources/mybatis/mapper/info/SyncUploadDataBustypeDao.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/info/SyncUploadDataSetDao.xml diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java index c41cfb2f..9a244fc3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.controller.basic; +import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageInfo; @@ -131,8 +132,19 @@ public class UdiInfoController { @GetMapping("udiwms/udiinfo/local/filterByUuid") public BaseResponse filterLocalByUuid(FilterUdiInfoRequest productInfoFilterRequest) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(productInfoFilterRequest.getRelId()); + udiRelevanceService.selectByUuid(productInfoFilterRequest.getUuid()); List udiInfoEntities = udiInfoService.filterAllUdiInfo(productInfoFilterRequest); + if (CollUtil.isNotEmpty(udiInfoEntities)) { + for (UdiInfoEntity udiInfoEntity : udiInfoEntities) { + if (udiRelevanceEntity != null) { + udiInfoEntity.setManufactory(udiRelevanceEntity.getManufactory()); + udiInfoEntity.setMeasname(udiRelevanceEntity.getMeasname()); + } + } + } return ResultVOUtils.success(udiInfoEntities); + } //获取ERP产品信息 diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/ThirdUploadSetController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/info/ThirdUploadSetController.java new file mode 100644 index 00000000..5bf0b257 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/info/ThirdUploadSetController.java @@ -0,0 +1,57 @@ +package com.glxp.api.admin.controller.info; + +import cn.hutool.core.collection.CollUtil; +import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.constant.Constant; +import com.glxp.api.admin.entity.info.SyncDataBustypeEntity; +import com.glxp.api.admin.entity.info.SyncDataSetEntity; +import com.glxp.api.admin.entity.info.SyncUploadDataSetEntity; +import com.glxp.api.admin.res.info.SyncDataSetResponse; +import com.glxp.api.admin.service.info.SyncUploadDataBustypeService; +import com.glxp.api.admin.service.info.SyncUploadDataSetService; +import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.List; + +@RestController +public class ThirdUploadSetController { + @Resource + SyncUploadDataSetService syncUploadDataSetService; + @Resource + SyncUploadDataBustypeService syncUploadDataBustypeService; + + @AuthRuleAnnotation("system/third/syncData/config") + @GetMapping("/system/third/syncData/config") + public BaseResponse list() { + + SyncUploadDataSetEntity syncDataSetResponse = syncUploadDataSetService.selectSet(); + return ResultVOUtils.success(syncDataSetResponse); + } + + @AuthRuleAnnotation("system/third/syncData/save") + @PostMapping("/system/third/syncData/save") + public BaseResponse save(@RequestBody @Valid SyncUploadDataSetEntity syncUploadDataSetEntity + ) { + List busTypes = syncUploadDataSetEntity.getBusTypes(); + syncUploadDataBustypeService.deleteAll(); + if (CollUtil.isNotEmpty(busTypes)) + syncUploadDataBustypeService.inserts(busTypes); + syncUploadDataSetEntity.setBusTypes(null); + boolean b = syncUploadDataSetService.insert(syncUploadDataSetEntity); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success(); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SyncUploadDataBustypeDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/info/SyncUploadDataBustypeDao.java new file mode 100644 index 00000000..302732b6 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/info/SyncUploadDataBustypeDao.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.dao.info; + +import com.glxp.api.admin.entity.info.SyncDataBustypeEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface SyncUploadDataBustypeDao { + + List findAll(); + + boolean deleteAll(); + + void inserts(@Param("syncDataBustypeEntities") List syncDataBustypeEntities); + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SyncUploadDataSetDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/info/SyncUploadDataSetDao.java new file mode 100644 index 00000000..a77966a1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/info/SyncUploadDataSetDao.java @@ -0,0 +1,13 @@ +package com.glxp.api.admin.dao.info; + +import com.glxp.api.admin.entity.info.SyncUploadDataSetEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SyncUploadDataSetDao { + + SyncUploadDataSetEntity selectSet(); + + boolean insert(SyncUploadDataSetEntity syncDataSetEntity); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java index 37788d2f..1d5ff46b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java @@ -62,6 +62,7 @@ public class UdiInfoEntity { private boolean allowNoBatch; private boolean allowNoExpire; private boolean allowNoProduct; + private String spmc; public Integer getId() { return id; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncUploadDataSetEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncUploadDataSetEntity.java new file mode 100644 index 00000000..70a35f0f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncUploadDataSetEntity.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.entity.info; + +import lombok.Data; + +import java.util.List; + +@Data +public class SyncUploadDataSetEntity { + + private Integer id; + private boolean autoUpload; + private Integer orderSyncTime; + private boolean orderUnCheck; + private boolean orderUnReceive; + private boolean orderScanFinish; + + + private List busTypes; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java index c515e305..025ddf07 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java @@ -57,6 +57,6 @@ public class FilterUdiInfoRequest extends ListPageRequest { private String supName; private String unitFk; private String originUuid; - + private String relId; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java index d7a62380..55ae37b1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java @@ -68,8 +68,9 @@ public class UdiRelevanceResponse { private boolean allowNoBatch; private boolean allowNoExpire; private boolean allowNoProduct; - + private String measname; private String price; + private String spmc; public int getBhzxxsbzsl() { if (bhzxxsbzsl == null || bhzxxsbzsl == 0) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java index edc4aa81..d024f160 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java @@ -69,4 +69,5 @@ public class CompanyProductRelevanceResponse { private boolean allowNoProduct; private String price; + private String spmc; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/SyncUploadDataBustypeService.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/SyncUploadDataBustypeService.java new file mode 100644 index 00000000..195fa31a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/info/SyncUploadDataBustypeService.java @@ -0,0 +1,15 @@ +package com.glxp.api.admin.service.info; + +import com.glxp.api.admin.entity.info.SyncDataBustypeEntity; + +import java.util.List; + +public interface SyncUploadDataBustypeService { + + List findAll(); + + boolean deleteAll(); + + void inserts(List syncDataBustypeEntities); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/SyncUploadDataSetService.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/SyncUploadDataSetService.java new file mode 100644 index 00000000..e6dc1c8b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/info/SyncUploadDataSetService.java @@ -0,0 +1,14 @@ +package com.glxp.api.admin.service.info; + +import com.glxp.api.admin.entity.info.SyncUploadDataSetEntity; + +public interface SyncUploadDataSetService { + + + SyncUploadDataSetEntity findSet(); + + SyncUploadDataSetEntity selectSet(); + + boolean insert(SyncUploadDataSetEntity syncUploadDataSetEntity); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SyncUploadDataBustypeServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SyncUploadDataBustypeServiceImpl.java new file mode 100644 index 00000000..d901e163 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SyncUploadDataBustypeServiceImpl.java @@ -0,0 +1,31 @@ +package com.glxp.api.admin.service.info.impl; + +import com.glxp.api.admin.dao.info.SyncUploadDataBustypeDao; +import com.glxp.api.admin.entity.info.SyncDataBustypeEntity; +import com.glxp.api.admin.service.info.SyncUploadDataBustypeService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class SyncUploadDataBustypeServiceImpl implements SyncUploadDataBustypeService { + + @Resource + SyncUploadDataBustypeDao syncUploadDataBustypeDao; + + @Override + public List findAll() { + return syncUploadDataBustypeDao.findAll(); + } + + @Override + public boolean deleteAll() { + return syncUploadDataBustypeDao.deleteAll(); + } + + @Override + public void inserts(List syncDataBustypeEntities) { + syncUploadDataBustypeDao.inserts(syncDataBustypeEntities); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SyncUploadDataSetServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SyncUploadDataSetServiceImpl.java new file mode 100644 index 00000000..e09125e5 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SyncUploadDataSetServiceImpl.java @@ -0,0 +1,49 @@ +package com.glxp.api.admin.service.info.impl; + +import com.glxp.api.admin.dao.info.SyncUploadDataSetDao; +import com.glxp.api.admin.entity.info.SyncDataBustypeEntity; +import com.glxp.api.admin.entity.info.SyncUploadDataSetEntity; +import com.glxp.api.admin.service.info.SyncDataBustypeService; +import com.glxp.api.admin.service.info.SyncUploadDataBustypeService; +import com.glxp.api.admin.service.info.SyncUploadDataSetService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class SyncUploadDataSetServiceImpl implements SyncUploadDataSetService { + + @Resource + SyncUploadDataSetDao syncUploadDataSetDao; + @Resource + SyncUploadDataBustypeService syncUploadDataBustypeService; + + @Override + public SyncUploadDataSetEntity findSet() { + SyncUploadDataSetEntity syncDataSetEntity = syncUploadDataSetDao.selectSet(); + return syncDataSetEntity; + } + + @Override + public SyncUploadDataSetEntity selectSet() { + SyncUploadDataSetEntity syncDataSetEntity = syncUploadDataSetDao.selectSet(); + if (syncDataSetEntity == null) { + syncDataSetEntity = new SyncUploadDataSetEntity(); + syncDataSetEntity.setId(1); + syncDataSetEntity.setAutoUpload(false); + syncDataSetEntity.setOrderSyncTime(1); + syncUploadDataSetDao.insert(syncDataSetEntity); + } + List syncDataBustypeEntities = syncUploadDataBustypeService.findAll(); + syncDataSetEntity.setBusTypes(syncDataBustypeEntities); + return syncDataSetEntity; + } + + + @Override + public boolean insert(SyncUploadDataSetEntity syncDataSetEntity) { + return syncUploadDataSetDao.insert(syncDataSetEntity); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java index a47160fc..7241fce2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/HeartTask.java @@ -55,7 +55,6 @@ public class HeartTask implements SchedulingConfigurer { private void process() { //查询数据同步设置 - logger.error("心跳任务--------------------------------------"+Thread.currentThread().getName()); SyncDataSetEntity syncDataSetEntity = syncDataSetDao.selectSet(); if (syncDataSetEntity.isDownstreamEnable()) { //定时上传最近更新基础数据至上游轮询时间 diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/OrderSubmitTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/OrderSubmitTask.java index b3a0ddbe..4d91768f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/OrderSubmitTask.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/OrderSubmitTask.java @@ -2,6 +2,7 @@ package com.glxp.api.admin.thread; import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONUtil; +import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.constant.ThirdSysConstant; import com.glxp.api.admin.dao.basic.BasicThirdSysBusApiDao; import com.glxp.api.admin.dao.basic.BasicThirdSysDao; @@ -9,10 +10,17 @@ import com.glxp.api.admin.dao.basic.BasicThirdSysDetailDao; import com.glxp.api.admin.dao.schedule.ScheduledDao; import com.glxp.api.admin.dao.schedule.SystemParamConfigDao; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity; +import com.glxp.api.admin.entity.business.StockOrderEntity; import com.glxp.api.admin.entity.info.ScheduledEntity; +import com.glxp.api.admin.entity.info.SyncDataBustypeEntity; +import com.glxp.api.admin.entity.info.SyncUploadDataSetEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.entity.inout.OrderEntity; import com.glxp.api.admin.req.info.ScheduledRequest; +import com.glxp.api.admin.service.basic.BussinessLocalTypeService; import com.glxp.api.admin.service.business.StockOrderService; +import com.glxp.api.admin.service.info.SyncUploadDataSetService; import com.glxp.api.admin.service.inout.OrderService; import com.glxp.api.common.res.BaseResponse; import lombok.extern.slf4j.Slf4j; @@ -48,6 +56,12 @@ public class OrderSubmitTask implements SchedulingConfigurer { private BasicThirdSysDao basicThirdSysDao; @Resource private BasicThirdSysBusApiDao basicThirdSysBusApiDao; + @Resource + BussinessLocalTypeService bussinessLocalTypeService; + + @Resource + SyncUploadDataSetService syncUploadDataSetService; + @Override public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { @@ -66,13 +80,13 @@ public class OrderSubmitTask implements SchedulingConfigurer { private void process() { - log.error("OrderSubmitTask--------------------------------------" + Thread.currentThread().getName()); - SystemParamConfigEntity auto_submit_order = systemParamConfigDao.selectByParamKey("auto_submit_order"); - if (auto_submit_order.getParamValue().equals("0")) { - log.info("未开启自动提交单据"); + + SyncUploadDataSetEntity syncUploadDataSetEntity = syncUploadDataSetService.selectSet(); + if (!syncUploadDataSetEntity.isAutoUpload()) { return; } + //查询所有启用的第三方系统的标识 List thirdIds = basicThirdSysDao.selectEnabledThirdId(); if (CollUtil.isNotEmpty(thirdIds)) { @@ -86,19 +100,42 @@ public class OrderSubmitTask implements SchedulingConfigurer { List orderIds = orderService.getWaitSubmitOrder(); AtomicInteger counter = new AtomicInteger(0); if (CollUtil.isNotEmpty(orderIds)) { - log.info("待提交单据数量为： {} 条", orderIds.size()); for (String orderId : orderIds) { - log.info("开始提交id为： {} 的单据", orderId); - BaseResponse baseResponse = stockOrderService.submitOrderToThirdys(orderId); - if (baseResponse.getCode() == 20000) { - counter.addAndGet(1); - log.info("自动提交成功"); + + StockOrderEntity stockOrderEntity = stockOrderService.findByBillNo(orderId); + BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType()); + + if (stockOrderEntity.getStatus() == ConstantStatus.SORDER_DELIVER) { + if (!syncUploadDataSetEntity.isOrderScanFinish()) { + continue; + } + } else if (stockOrderEntity.getStatus() == ConstantStatus.SORDER_CHECKED) { + if (!syncUploadDataSetEntity.isOrderUnReceive()) { + continue; + } + } else if (stockOrderEntity.getStatus() == ConstantStatus.SORDER_CHECK) { + if (!syncUploadDataSetEntity.isOrderUnCheck()) { + continue; + } + } else { - log.error("自动提交失败，响应信息：{}" + JSONUtil.toJsonStr(baseResponse)); + continue; + } + + if (bussinessLocalTypeEntity != null + && isConatin(syncUploadDataSetEntity.getBusTypes(), bussinessLocalTypeEntity.getLocalAction()) + ) { + BaseResponse baseResponse = stockOrderService.submitOrderToThirdys(orderId); + if (baseResponse.getCode() == 20000) { + counter.addAndGet(1); + } else { + log.error("自动提交失败，响应信息：{}" + JSONUtil.toJsonStr(baseResponse)); + } } } } - log.info("单据自动提交完成，提交成功： {} 条", counter.get()); + + } } } @@ -106,4 +143,18 @@ public class OrderSubmitTask implements SchedulingConfigurer { } + public boolean isConatin(List syncDataBustypeEntities, String action) { + if (CollUtil.isNotEmpty(syncDataBustypeEntities)) { + for (SyncDataBustypeEntity syncDataBustypeEntity : syncDataBustypeEntities) { + if (syncDataBustypeEntity.getAction().equals(action)) { + return true; + } + } + } + + + return false; + } + + } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml index 458d8c28..9f45dea9 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml @@ -52,6 +52,7 @@ basic_products.scbssfbhxlh, basic_products.scbssfbhscrq, basic_products.scbssfbhsxrq,basic_products.cpms,basic_products.originUuid,company_product_relevance.price + ,basic_products.spmc FROM company_product_relevance inner JOIN basic_udirel ON company_product_relevance.udiRlIdFk = basic_udirel.id diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml index 2399e017..dbb638fb 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml @@ -47,7 +47,7 @@ basic_products.scbssfbhxlh, basic_products.scbssfbhscrq, basic_products.scbssfbhsxrq,basic_products.cpms,basic_products.originUuid,basic_products.allowNoBatch, - basic_products.allowNoExpire,basic_products.allowNoProduct + basic_products.allowNoExpire,basic_products.allowNoProduct,basic_products.spmc FROM (company_product_relevance inner JOIN basic_udirel ON company_product_relevance.udiRlIdFk = basic_udirel.id) diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 8437fcbc..ff88161c 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -202,7 +202,7 @@ basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph, basic_products.scbssfbhxlh, basic_products.scbssfbhscrq, - basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid + basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid,basic_products.spmc FROM basic_products right JOIN basic_udirel ON basic_products.uuid = basic_udirel.uuid diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml index 07bae4dd..a7d89088 100644 --- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml @@ -268,7 +268,7 @@ stock_order_detail.count, stock_order_detail.sweepCount, stock_order_detail.ylqxzcrbarmc,stock_order_detail.manufactory, stock_order_detail.zczbhhzbapzbh,stock_order_detail.price,inv_warehouse.name locInv - ,productinfo.spmc + ,basic_products.spmc FROM stock_order INNER JOIN stock_order_detail on stock_order.id = @@ -278,7 +278,6 @@ LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code` left join basic_udirel on stock_order_detail.productId = basic_udirel.id INNER JOIN basic_products on basic_products.uuid = basic_udirel.uuid - INNER JOIN productinfo on productinfo.uuid = basic_products.originUuid and stock_order.id =#{id} @@ -310,13 +309,12 @@ resultType="com.glxp.api.admin.entity.business.StockOrderPrintEntity"> select io_codes.code udiCode,basic_udirel.id productId,basic_products.cpmctymc productName,basic_products.ggxh spec,io_codes.batchNo,io_codes.produceDate productDate,io_codes.expireDate ,io_codes.serialNo,io_codes.count, - basic_products.ylqxzcrbarmc,basic_products.manufactory,basic_udirel.measname,basic_products.zczbhhzbapzbh, - inv_warehouse.name locInv,productinfo.spmc, basic_products.cpms + basic_products.ylqxzcrbarmc,basic_udirel.manufactory,basic_udirel.measname,basic_products.zczbhhzbapzbh, + inv_warehouse.name locInv,basic_products.spmc, basic_products.cpms from io_codes INNER JOIN basic_udirel on io_codes.relId = basic_udirel.id INNER JOIN basic_products on basic_products.uuid = basic_udirel.uuid LEFT JOIN inv_warehouse ON io_codes.locStorageCode = inv_warehouse.`code` - left JOIN productinfo on productinfo.uuid = basic_products.originUuid and io_codes.orderId =#{orderId} diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SyncUploadDataBustypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/SyncUploadDataBustypeDao.xml new file mode 100644 index 00000000..e1f81bc2 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/info/SyncUploadDataBustypeDao.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + DELETE + FROM thr_order_upload_bustypes + + + + insert INTO thr_order_upload_bustypes + ( `action`, `name`) + values + + + ( + #{item.action}, #{item.name} + ) + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SyncUploadDataSetDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/SyncUploadDataSetDao.xml new file mode 100644 index 00000000..9a429038 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/info/SyncUploadDataSetDao.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + replace + INTO thr_order_upload(id,autoUpload, orderSyncTime,orderUnCheck,orderUnReceive,orderScanFinish) + values ( + #{id}, + #{autoUpload}, + #{orderSyncTime}, + #{orderUnCheck}, + #{orderUnReceive}, + #{orderScanFinish} + ) + + + + \ No newline at end of file