From f332a826bfc1de13746db1a9570b6bfc117a35ac Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Tue, 19 Jul 2022 18:01:35 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=89=AB=E7=A0=81=E5=8D=95=E6=8D=AE=E7=94=9F?= =?UTF-8?q?=E6=88=90=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E5=8A=A0=E4=BB=B7?= =?UTF-8?q?=E6=A0=BC=EF=BC=9B=202.=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E4=BF=A1=E6=81=AF=E6=8F=92=E5=85=A5=E6=97=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=9B=203.=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/UdiInfoController.java | 3 +- .../business/StockOrderDetailController.java | 56 ++++++++++++-- .../inout/OrderDetailController.java | 51 +++++++++--- .../api/admin/dao/thrsys/ThrProductsDao.java | 4 + .../api/admin/entity/basic/UdiInfoEntity.java | 2 + .../business/StockOrderDetailEntity.java | 3 + .../admin/entity/inout/ErpOrderEntity.java | 4 + .../business/impl/StockOrderServiceImpl.java | 10 +-- .../service/thrsys/ThrProductsService.java | 2 + .../thrsys/impl/ThrProductsServiceImpl.java | 5 ++ .../api/admin/thread/IoTransInoutService.java | 7 +- .../admin/thread/ThrProductsDlService.java | 8 +- .../mybatis/mapper/thrsys/ThrProductsDao.xml | 77 ++++++++++++++++++- 13 files changed, 202 insertions(+), 30 deletions(-) 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 7b6d50b4..57e531ec 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 @@ -129,13 +129,14 @@ public class UdiInfoController { public BaseResponse filterLocalByUuid(FilterUdiInfoRequest productInfoFilterRequest) { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(productInfoFilterRequest.getRelId()); - udiRelevanceService.selectByUuid(productInfoFilterRequest.getUuid()); +// 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()); + udiInfoEntity.setPrice(udiRelevanceEntity.getPrice()); } } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java index abed5adc..d6e45e8c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.controller.business; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.annotation.AuthRuleAnnotation; @@ -10,7 +11,10 @@ import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.api.admin.entity.basic.UdiEntity; import com.glxp.api.admin.entity.basic.UdiInfoEntity; import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.entity.business.StockOrderEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import com.glxp.api.admin.entity.inout.WarehouseEntity; import com.glxp.api.admin.exception.JsonException; import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; @@ -31,9 +35,11 @@ import com.glxp.api.admin.service.basic.UdiInfoService; import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.business.StockOrderDetailService; import com.glxp.api.admin.service.business.StockOrderDetailTempService; +import com.glxp.api.admin.service.business.StockOrderService; import com.glxp.api.admin.service.business.StockQRCodeTextService; import com.glxp.api.admin.service.info.CompanyProductRelevanceService; import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.admin.service.inout.CodesService; import com.glxp.api.admin.thread.IoTransInoutService; import com.glxp.api.admin.util.FilterUdiUtils; import com.glxp.api.common.enums.ResultEnum; @@ -51,6 +57,8 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; @RestController @@ -59,9 +67,9 @@ public class StockOrderDetailController { @Resource StockOrderDetailService stockOrderDetailService; @Resource - StockOrderDetailTempService stockOrderDetailTempService; + StockOrderService stockOrderService; @Resource - StockQRCodeTextService stockQRCodeTextService; + StockOrderDetailTempService stockOrderDetailTempService; @Resource UdiInfoService udiInfoService; @Resource @@ -69,16 +77,15 @@ public class StockOrderDetailController { @Resource private CompanyProductRelevanceService companyProductRelevanceService; - @Resource - private IoTransInoutService transInoutService; @Autowired private SystemParamConfigService systemParamConfigService; @Resource AuthAdminService authAdminService; @Resource - BussinessTypeService bussinessTypeService; - @Resource BussinessLocalTypeService bussinessLocalTypeService; + @Resource + CodesService codesService; + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/detail/filter") @@ -88,8 +95,15 @@ public class StockOrderDetailController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + + StockOrderEntity stockOrderEntity = stockOrderService.findById(stockOrderDetailFilterRequest.getOrderIdFk()); + String value = systemParamConfigService.selectValueByParamKey("oeder_detail_by_code"); List stockOrderDetailEntityList = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest); +// if (StrUtil.isNotEmpty(value) && value.equals("1")) { +// stockOrderDetailEntityList = transferSerList(stockOrderDetailEntityList, stockOrderEntity.getOrderIdFk()); +// } + PageInfo pageInfo; pageInfo = new PageInfo<>(stockOrderDetailEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -98,6 +112,36 @@ public class StockOrderDetailController { return ResultVOUtils.success(pageSimpleResponse); } + public List transferSerList(List stockOrderDetailEntities, String orderId) { + List resultList = new ArrayList<>(); + List codeList = codesService.findByReceiptId(orderId); + if (CollUtil.isNotEmpty(stockOrderDetailEntities)) { + for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntities) { + if (CollUtil.isNotEmpty(codeList)) { + for (WarehouseEntity codeDetaiEntity : codeList) { + if (StrUtil.trimToEmpty(codeDetaiEntity.getRelId()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId())) + && StrUtil.trimToEmpty(codeDetaiEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo())) + ) { + StockOrderDetailEntity item = new StockOrderDetailEntity(); + BeanUtils.copyProperties(stockOrderDetailEntity, item); + item.setCode(codeDetaiEntity.getCode()); + item.setSerialNo(codeDetaiEntity.getSerialNo()); + item.setCount(codeDetaiEntity.getCount()); + resultList.add(item); + } + + + } + } + } + } + Collections.sort(resultList, (o1, o2) -> { + Long cp = Long.parseLong(o1.getProductId()) - Long.parseLong(o2.getProductId()); + return cp.intValue(); + }); + return resultList; + } + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/detail/filter2") public BaseResponse filterStockOrderDetail2(StockOrderDetailFilterRequest stockOrderDetailFilterRequest, diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java index b0475f73..ce370199 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java @@ -22,6 +22,9 @@ import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; import com.glxp.api.admin.httpclient.ErpOrderClient; import com.glxp.api.admin.httpclient.SpsDirectClient; +import com.glxp.api.admin.httpclient.req.UdiwmsOrderDetail; +import com.glxp.api.admin.httpclient.req.UdiwmsOrderRequest; +import com.glxp.api.admin.httpclient.req.UdiwmsPreInOrderRequest; import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; import com.glxp.api.admin.req.business.StockOrderFilterRequest; import com.glxp.api.admin.req.info.SystemParamConfigRequest; @@ -62,10 +65,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @RestController @@ -78,13 +78,11 @@ public class OrderDetailController { @Resource OrderService orderService; @Resource - private UdiRelevanceService udiRelevanceService; - @Resource private CheckOrderUtils checkOrderUtils; @Resource private IoTransInoutService transInoutService; - @Autowired + @Resource private SystemParamConfigService systemParamConfigService; @Resource @@ -97,15 +95,11 @@ public class OrderDetailController { @Resource private StockOrderDetailService stockOrderDetailService; - @Resource - private CompanyService companyService; @Resource private BussinessTypeService bussinessTypeService; @Resource ThrDataService thrDataService; @Resource - InvProductsTrService invProductsTrService; - @Resource IoTransInoutService ioTransInoutService; @Resource BussinessOriginTypeService bussinessOriginTypeService; @@ -459,15 +453,50 @@ public class OrderDetailController { if (filterErpOrderRequest.getOrderId() == null || filterErpOrderRequest.getOrderId().equals("")) { filterErpOrderRequest.setOrderId("1"); } + String value = systemParamConfigService.selectValueByParamKey("oeder_detail_by_code"); filterErpOrderRequest.setPage(1); filterErpOrderRequest.setLimit(100); List erpOrderEntities = orderDetailService.filterMyErpOrder(filterErpOrderRequest); + +// if (StrUtil.isNotEmpty(value) && value.equals("1")) { +// erpOrderEntities = transferSerList(erpOrderEntities, filterErpOrderRequest.getOrderIdFk()); +// } if (CollUtil.isEmpty(erpOrderEntities)) { return spsDirectClient.downloadOrderDetail(filterErpOrderRequest.getOrderId(), customerService.getUserId() + ""); } return ResultVOUtils.success(erpOrderEntities); } + + public List transferSerList(List erpOrderEntities, String orderId) { + + List resultList = new ArrayList<>(); + List codeList = codesService.findByReceiptId(orderId); + if (CollUtil.isNotEmpty(erpOrderEntities)) { + for (ErpOrderEntity erpOrderEntity : erpOrderEntities) { + if (CollUtil.isNotEmpty(codeList)) { + for (WarehouseEntity codeDetaiEntity : codeList) { + if (StrUtil.trimToEmpty(codeDetaiEntity.getRelId()).equals(StrUtil.trimToEmpty(erpOrderEntity.getRelIdFk())) + && StrUtil.trimToEmpty(codeDetaiEntity.getBatchNo()).equals(StrUtil.trimToEmpty(erpOrderEntity.getBatchNo())) + ) { + ErpOrderEntity item = new ErpOrderEntity(); + BeanUtils.copyProperties(erpOrderEntity, item); + item.setCode(codeDetaiEntity.getCode()); + item.setSerialNo(codeDetaiEntity.getSerialNo()); + item.setCount(codeDetaiEntity.getCount()); + resultList.add(item); + } + } + } + } + } + Collections.sort(resultList, (o1, o2) -> { + Long cp = Long.parseLong(o1.getBindRlFk()) - Long.parseLong(o2.getBindRlFk()); + return cp.intValue(); + }); + return resultList; + } + @AuthRuleAnnotation("") @GetMapping(value = "/warehouse/inout/order/uploadOrder") public BaseResponse uploadOrder(FilterErpOrderRequest filterErpOrderRequest, diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java index c3c2ce4e..41897977 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java @@ -15,8 +15,12 @@ public interface ThrProductsDao { List batchSelectByIds(FilterThrProductsRequest filterThrProductsRequest); ThrProductsEntity selectById(@Param("id") String id); + List selectThrProducts(FilterThrProductsRequest filterThrProductsRequest); + + boolean insertOrUpdateSelective(ThrProductsEntity thrProductsEntity); + boolean insertThrProducts(ThrProductsEntity thrProductsEntity); boolean insertThrProductss(@Param("thrProductsEntities") List thrProductsEntities); 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 1d5ff46b..6bc5dc2c 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 @@ -64,6 +64,8 @@ public class UdiInfoEntity { private boolean allowNoProduct; private String spmc; + private String price; + public Integer getId() { return id; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java index 27f7d88f..8b816a55 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java @@ -37,4 +37,7 @@ public class StockOrderDetailEntity { private String manufactory; private boolean allowNoBatch; + private String code; + private String serialNo; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/ErpOrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/ErpOrderEntity.java index 8f09be01..6bfcf1b2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/ErpOrderEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/ErpOrderEntity.java @@ -71,4 +71,8 @@ public class ErpOrderEntity { private String bindRlFk; + private String serialNo; + private String code; + + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java index 28c91d8d..5b2c3d9e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java @@ -361,8 +361,6 @@ public class StockOrderServiceImpl implements StockOrderService { }); if (baseResponse.getCode().equals(20000)) { UdiwmsOrderResponse udiwmsOrderResponse = baseResponse.getData(); - - orderEntity.setExportStatus(1); if (udiwmsOrderResponse != null) { orderEntity.setThirdBillNo(udiwmsOrderResponse.getThirdBillNo()); @@ -376,7 +374,7 @@ public class StockOrderServiceImpl implements StockOrderService { return ResultVOUtils.success("提交成功"); } uploadLog.setStatus(3); - uploadLog.setResult("提交失败"); + uploadLog.setResult("提交失败;错误信息：" + baseResponse.getMessage()); stockOrderUploadLogService.insert(uploadLog); return ResultVOUtils.error(500, "提交失败"); } catch (Exception e) { @@ -412,8 +410,6 @@ public class StockOrderServiceImpl implements StockOrderService { AuthAdmin authAdmin = authAdminService.findById(orderEntity.getCreateUser().longValue()); udiwmsPreInOrderRequest.setActor(authAdmin.getEmployeeName()); } - - List itemDTOS = new ArrayList<>(); if (CollUtil.isNotEmpty(udiwmsOrderRequest.getItem())) { for (UdiwmsOrderDetail udiwmsOrderDetail : udiwmsOrderRequest.getItem()) { @@ -424,6 +420,7 @@ public class StockOrderServiceImpl implements StockOrderService { itemDTO.setCode(codeDetaiEntity.getCode()); itemDTO.setCount(codeDetaiEntity.getCount()); itemDTOS.add(itemDTO); + } } } @@ -473,6 +470,9 @@ public class StockOrderServiceImpl implements StockOrderService { request.setBillTypes(billTypes); } } + + int offset = (request.getPage() - 1) * request.getLimit(); + PageHelper.offsetPage(offset, request.getLimit()); List stockOrderEntityList = stockOrderDao.selectUploadList(request); return stockOrderEntityList; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java index 6cc3e912..aa5d4ef5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java @@ -15,6 +15,8 @@ public interface ThrProductsService { ThrProductsEntity selectById(String id); + boolean insertOrUpdateSelective(ThrProductsEntity thrProductsEntity); + boolean insertThrProducts(ThrProductsEntity thrProductsEntity); boolean insertThrProductss(List thrProductsEntities); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java index b160a396..4a0734a3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java @@ -63,6 +63,11 @@ public class ThrProductsServiceImpl implements ThrProductsService { return thrProductsDao.selectById(id); } + @Override + public boolean insertOrUpdateSelective(ThrProductsEntity thrProductsEntity) { + return thrProductsDao.insertOrUpdateSelective(thrProductsEntity); + } + @Override public boolean insertThrProducts(ThrProductsEntity thrProductsEntity) { return thrProductsDao.insertThrProducts(thrProductsEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java index b70502fc..c7df142b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java @@ -61,6 +61,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -251,7 +252,6 @@ public class IoTransInoutService { } - //查找等待处理单据，转入正式表 @Async public void transInout() { @@ -803,6 +803,11 @@ public class IoTransInoutService { UdiRelevanceResponse udiRelevanceEntity = udiRelevanceService.selectGroupById(stockOrderDetailEntity.getRelId()); stockOrderDetailEntity.setProductName(erpOrderEntity.getGoodsname()); stockOrderDetailEntity.setYlqxzcrbarmc(udiRelevanceEntity.getYlqxzcrbarmc()); + if (erpOrderEntity.getPrice() == null) { + if (StrUtil.isNotEmpty(udiRelevanceEntity.getPrice())) { + stockOrderDetailEntity.setPrice(new BigDecimal(udiRelevanceEntity.getPrice())); + } + } stockOrderDetailEntity.setManufactory(udiRelevanceEntity.getManufactory()); stockOrderDetailEntity.setPrice(erpOrderEntity.getPrice()); stockOrderDetailEntity.setFirstSalesInvNo(erpOrderEntity.getFirstSalesInvNo()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java index 2dae8dca..795061fb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java @@ -92,6 +92,7 @@ public class ThrProductsDlService { ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); BeanUtils.copyProperties(item, thrProductsEntity); thrProductsEntity.setUpdateTime(new Date()); +// thrProductsService.insertOrUpdateSelective(thrProductsEntity); return thrProductsEntity; } ).collect(Collectors.toList()); @@ -391,13 +392,14 @@ public class ThrProductsDlService { ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); BeanUtils.copyProperties(item, thrProductsEntity); thrProductsEntity.setUpdateTime(new Date()); + thrProductsService.insertOrUpdateSelective(thrProductsEntity); return thrProductsEntity; } ).collect(Collectors.toList()); List> products = CustomUtil.splitList(thrProductsEntities, 100); - for (List data : products) { - thrProductsService.insertThrProductss(data); - } +// for (List data : products) { +// thrProductsService.insertThrProductss(data); +// } thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); thrProductsImportLogEntity.setUpdateTime(new Date()); thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml index ba36f04a..0b0c347e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml @@ -81,7 +81,6 @@ - - + replace INTO thr_products (code, `name`, measname, spec, registerNo, manufactory, @@ -122,7 +122,8 @@ #{remark}, #{remark1}, #{remark2}, - #{remark3},#{price} + #{remark3}, + #{price} ) @@ -149,6 +150,76 @@ + + + insert + INTO thr_products + (code, `name`, measname, spec, registerNo, manufactory, + cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms, + thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3,price) + values ( + #{code}, + #{name}, + #{measname}, + #{spec}, + #{registerNo}, + #{manufactory}, + #{cplb}, + #{flbm}, + #{qxlb}, + #{ybbm}, + #{sptm}, + #{tyshxydm}, + #{zczbhhzbapzbh}, + #{ylqxzcrbarmc}, + #{ylqxzcrbarywmc}, + #{cpms}, + #{thirdSysFk}, + #{updateTime}, + #{supName}, + #{model}, + #{standard}, + #{qtbm}, + #{zczyxqz}, + #{remark}, + #{remark1}, + #{remark2}, + #{remark3},#{price} + ) + on duplicate key update + + code=#{code}, + name=#{name}, + measname=#{measname}, + spec=#{spec}, + registerNo=#{registerNo}, + cplb=#{cplb}, + flbm=#{flbm}, + qxlb=#{qxlb}, + ybbm=#{ybbm}, + sptm=#{sptm}, + tyshxydm=#{tyshxydm}, + zczbhhzbapzbh=#{zczbhhzbapzbh}, + ylqxzcrbarmc=#{ylqxzcrbarmc}, + ylqxzcrbarywmc=#{ylqxzcrbarywmc}, + manufactory=#{manufactory}, + cpms=#{cpms}, + thirdSysFk=#{thirdSysFk}, + updateTime=#{updateTime}, + supName=#{supName}, + model=#{model}, + standard=#{standard}, + zczyxqz=#{zczyxqz}, + remark=#{remark}, + remark1=#{remark1}, + remark2=#{remark2}, + remark3=#{remark3}, + price=#{price}, + + + + DELETE FROM thr_products