From 6929f3b32d7d2d7b9f87d34beb7897b6e19eb8fc Mon Sep 17 00:00:00 2001 From: siontion Date: Thu, 1 Aug 2024 10:40:21 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=94=A8=E5=8F=8B=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E3=80=91ts=E4=BF=A1=E6=81=AF=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/chanjet/ChanjetController.java | 6 ++--- .../dal/dataobject/material/MaterialDO.java | 5 ++++ .../module/biz/manager/ChanjetManager.java | 25 ++++++++++++------- sql/v1.0.0/2.business/1.structure.sql | 4 +++ 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetController.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetController.java index 1ab2c911..41b73cf2 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetController.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetController.java @@ -264,13 +264,13 @@ public class ChanjetController { chanjetManager.queryMaterial(); //查询库存-现存量 chanjetSchedule.queryStock(); - //创建入库 - chanjetSchedule.createStorageInOrder(); +// //创建入库 +// chanjetSchedule.createStorageInOrder(); } @Scheduled(cron = "0 0 2 * * ?") public void synchronizeData2() throws ChanjetApiException{ //查询库存-现存量 - chanjetSchedule.createStorageOut(); +// chanjetSchedule.createStorageOut(); } } diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/material/MaterialDO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/material/MaterialDO.java index 606372b9..57191025 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/material/MaterialDO.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/material/MaterialDO.java @@ -176,4 +176,9 @@ public class MaterialDO extends TenantBaseDO { @Schema(description = "库存数量") private BigDecimal stockQuantity; + /** + * 用友时间戳 + */ + private String ts; + } diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java index b8b86cad..342c3f4a 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java @@ -552,7 +552,12 @@ public class ChanjetManager { public void queryMaterial() throws ChanjetApiException { // 设置为“否”，关闭所有与用友通信的接口 if(!getSystemParameters()) return ; - String maxTs = null; + + MaterialDO materialDOMaxTs = materialMapper.selectList(new LambdaUpdateWrapper(){{ + orderByDesc(MaterialDO::getTs); + }}).get(0); + + String maxTs = materialDOMaxTs== null?null:materialDOMaxTs.getTs(); HashSet materialIds = new HashSet<>(); do { QueryMaterialReqVO.QueryMaterialParamVO paramVO = new QueryMaterialReqVO.QueryMaterialParamVO(maxTs); @@ -591,6 +596,7 @@ public class ChanjetManager { .setSpec(vo.getSpecification()) .setDescription(vo.getInventoryDescript()) .setInventoryProperty(vo.getInventoryProperty()) + .setTs(vo.getTS()) ; if(vo.getUnitByStock() != null && !StringUtils.isEmpty(vo.getUnitByStock().getName())){ aDO.setUnit(vo.getUnitByStock().getName()); @@ -607,10 +613,10 @@ public class ChanjetManager { aDO.setLogo(vo.getImageFile()); } materialMapper.updateById(aDO); - if(CollUtil.isNotEmpty(vo.getFreeitembriefinfo())){ -// aDO.setColor(vo.getFreeitembriefinfo().get(0).getRange().get(0).getName()); - saveMaterialColor(vo.getFreeitembriefinfo(), aDO.getId()); - } +// if(CollUtil.isNotEmpty(vo.getFreeitembriefinfo())){ +//// aDO.setColor(vo.getFreeitembriefinfo().get(0).getRange().get(0).getName()); +// saveMaterialColor(vo.getFreeitembriefinfo(), aDO.getId()); +// } // updateList.add(aDO); }else{ MaterialDO aDO = new MaterialDO(); @@ -623,6 +629,7 @@ public class ChanjetManager { .setSpec(vo.getSpecification()) .setDescription(vo.getInventoryDescript()) .setInventoryProperty(vo.getInventoryProperty()) + .setTs(vo.getTS()) ; if(vo.getUnitByStock() != null && !StringUtils.isEmpty(vo.getUnitByStock().getName())){ aDO.setUnit(vo.getUnitByStock().getName()); @@ -639,10 +646,10 @@ public class ChanjetManager { aDO.setLogo(vo.getImageFile()); } materialMapper.insert(aDO); - if(CollUtil.isNotEmpty(vo.getFreeitembriefinfo())){ -// aDO.setColor(vo.getFreeitembriefinfo().get(0).getRange().get(0).getName()); - saveMaterialColor(vo.getFreeitembriefinfo(), aDO.getId()); - } +// if(CollUtil.isNotEmpty(vo.getFreeitembriefinfo())){ +//// aDO.setColor(vo.getFreeitembriefinfo().get(0).getRange().get(0).getName()); +// saveMaterialColor(vo.getFreeitembriefinfo(), aDO.getId()); +// } // insertList.add(aDO); } }); diff --git a/sql/v1.0.0/2.business/1.structure.sql b/sql/v1.0.0/2.business/1.structure.sql index 7d399fa3..f6e24e34 100644 --- a/sql/v1.0.0/2.business/1.structure.sql +++ b/sql/v1.0.0/2.business/1.structure.sql @@ -601,3 +601,7 @@ INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_t INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('L97*97线条','L97*97 DRESSING ','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2); INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('L80线条','L80 DRESSING ','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2); INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('L100*42线条','L100*42 DRESSING ','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2); + + +//================================20240801==================================================================== +alter table base_material add COLUMN ts varchar(20) default null COMMENT '用友时间戳'; \ No newline at end of file