From b8bddc66bffd143aa61995972b490aa9f978af69 Mon Sep 17 00:00:00 2001 From: hy2250089 Date: Thu, 9 Apr 2020 17:11:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=89=B9=E9=87=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/dao/ProductBatchDetectMapper.java | 1 + .../mapper/ProductBatchDetectDetMapper.xml | 6 ++-- .../mapper/ProductBatchDetectMapper.xml | 6 ++-- .../mapper/ProductProcessBatchDetMapper.xml | 2 +- .../ProductProcessBatchDetServiceImpl.java | 31 +++++++++++-------- 5 files changed, 26 insertions(+), 20 deletions(-) diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductBatchDetectMapper.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductBatchDetectMapper.java index 32cbb29..d611141 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductBatchDetectMapper.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductBatchDetectMapper.java @@ -3,6 +3,7 @@ package com.deer.wms.produce.manage.dao; import com.deer.wms.produce.manage.model.ProductBatchDetect; import com.deer.wms.produce.manage.model.ProductBatchDetectParams; import com.deer.wms.project.seed.core.mapper.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectDetMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectDetMapper.xml index c26ce15..ede7626 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectDetMapper.xml +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectDetMapper.xml @@ -54,11 +54,11 @@ DELETE FROM mt_alone_product_batch_detect_det WHERE 1>2 OR ( batch_det_id IN - - #{params.batchDetIdList[${item}]} + + #{item} - AND company_id = #{params.companyId} + AND company_id = #{companyId} ) \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectMapper.xml index 696fdf9..7752783 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectMapper.xml +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectMapper.xml @@ -38,11 +38,11 @@ DELETE FROM mt_alone_product_batch_detect WHERE 1>2 OR ( batch_det_id IN - - #{params.batchDetIdList[${item}]} + + #{item} - AND company_id = #{params.companyId} + AND company_id = #{companyId} ) diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessBatchDetMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessBatchDetMapper.xml index 1b0dffd..3b486fc 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessBatchDetMapper.xml +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessBatchDetMapper.xml @@ -99,7 +99,7 @@ - SELECT MAX(CAST(det.volume_num AS DECIMAL)) FROM mt_alone_product_process_batch_det det diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBatchDetServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBatchDetServiceImpl.java index 2d2577f..62b0d40 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBatchDetServiceImpl.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBatchDetServiceImpl.java @@ -64,8 +64,9 @@ public class ProductProcessBatchDetServiceImpl extends AbstractService batchDetVoListDB = productProcessBatchDetService.findListByProductProcess(productProcessParams); - //设置加工单的总卷数与前端明细个数相同,并更新加工单信息 - currentProductProcess.setPiNum(null==batchDetListFront?0:batchDetListFront.size()); + + //设置当前加工单的总卷数与前端明细个数相同,并更新加工单信息 + currentProductProcess.setPiNum(null==batchDetListFront ? 0:batchDetListFront.size()); productProcessService.update(currentProductProcess); Date date = new Date(); @@ -76,14 +77,15 @@ public class ProductProcessBatchDetServiceImpl extends AbstractService updateList = new ArrayList(); - //将新增明细放入一个list + //存放新增明细 List addList = new ArrayList(); for (ProductProcessBatchDet productProcessBatchDet : batchDetListFront){ - if(null!=productProcessBatchDet.getId()){//已有的明细（非新增明细），有id + if(null!=productProcessBatchDet.getId()){//库表已有的明细（非新增明细），有id productProcessBatchDet.setUpdateTime(date); - productProcessBatchDet.setShrinkage(productProcessBatchDet.getLen()/productProcessBatchDet.getDetectionLen()+""); + //空值或零值情况判断 + productProcessBatchDet.setShrinkage((null==productProcessBatchDet.getDetectionLen() || productProcessBatchDet.getDetectionLen()==0)?"0":(((null==productProcessBatchDet.getLen() || productProcessBatchDet.getLen()==0)?0:productProcessBatchDet.getLen())/productProcessBatchDet.getDetectionLen()+"")); updateList.add(productProcessBatchDet); }else{//新增明细，没有id productProcessBatchDet.setCreateTime(date); @@ -95,14 +97,15 @@ public class ProductProcessBatchDetServiceImpl extends AbstractService idsFront = batchDetListFront.stream().map(ProductProcessBatchDet::getId).collect(Collectors.toList()); @@ -111,11 +114,13 @@ public class ProductProcessBatchDetServiceImpl extends AbstractService deleteIdsDB = new ArrayList(idsDB); deleteIdsDB.removeAll(idsFront); - productProcessBatchDetService.deleteByIdsList(deleteIdsDB); - ProductBatchDetectParams batchDetectParams = new ProductBatchDetectParams(); - batchDetectParams.setBatchDetIdList(deleteIdsDB); - batchDetectParams.setCompanyId(currentProductProcess.getCompanyId()); - productBatchDetectService.deleteByBatchDet(batchDetectParams); + if(deleteIdsDB.size()!=0) { + productProcessBatchDetService.deleteByIdsList(deleteIdsDB); + ProductBatchDetectParams batchDetectParams = new ProductBatchDetectParams(); + batchDetectParams.setBatchDetIdList(deleteIdsDB); + batchDetectParams.setCompanyId(currentProductProcess.getCompanyId()); + productBatchDetectService.deleteByBatchDet(batchDetectParams); + } } }