From 613d004f5cf0d8d9bb529e1e30e0f5b297a5b1ba Mon Sep 17 00:00:00 2001 From: Junjie <xjj@123> Date: 星期五, 13 六月 2025 17:46:05 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java index 2e14e9b..95627ac 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java @@ -6,11 +6,14 @@ import com.core.common.R; import com.zy.asrs.entity.FrozenParam; import com.zy.asrs.entity.LocDetl; +import com.zy.asrs.entity.Mat; import com.zy.asrs.entity.result.LocDetlAll; import com.zy.asrs.entity.result.LocDetlDTO; import com.zy.asrs.entity.result.StockVo; import com.zy.asrs.mapper.LocDetlMapper; import com.zy.asrs.service.LocDetlService; +import com.zy.asrs.service.MatService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -20,6 +23,9 @@ @Service("locDetlService") public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService { + + @Autowired + private MatService matService; @Override public Page<LocDetl> getPage(Page<LocDetl> page) { @@ -58,7 +64,23 @@ if (anfme <= 0) { return this.baseMapper.deleteItem(locNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3) > 0; } else { - return baseMapper.updateAnfme(anfme, locNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3) > 0; + boolean result = baseMapper.updateAnfme(anfme, locNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3) > 0; + if (!result) { + return false; + } + + //鏇存柊杈呮枡 + Mat mat = matService.selectByMatnr(matnr); + if (mat == null) { + return false; + } + + //杞崲鍏崇郴 + String origin = mat.getOrigin(); + String[] split = origin.split("/"); + //杈呭崟浣� + Double weight = (anfme / Double.parseDouble(split[1])) / Double.parseDouble(split[0]); + return this.baseMapper.updateWeight(weight, locNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3) > 0; } } -- Gitblit v1.9.1