From bac4cc2bb0723a5d844820589bc56bed9fc6bc6d Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期三, 19 十一月 2025 13:53:42 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
index b0c4610..4b0b6d4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.HalfBarcode;
import com.zy.asrs.entity.Mat;
@@ -34,9 +35,15 @@
@Override
public void deleteMatBarcode(List<MatBarcode> list) {
for (MatBarcode matBarcode : list) {
+ //瀵规ā鍏风殑瑙勬牸鍋氬鐞嗗緱鍒板帤搴�
+ Integer thickness = 0;
+ if (!Cools.isEmpty(matBarcode.getSpecs())){
+ String[] split = matBarcode.getSpecs().split("\\*");
+ thickness = Integer.parseInt(split[1]);
+ }
HalfBarcode halfBarcode = halfBarcodeService.selectByZpallet(matBarcode.getZpallet());
halfBarcode.setAnfme(halfBarcode.getAnfme() - 1);
- halfBarcode.setPrice(halfBarcode.getPrice() + 1);
+ halfBarcode.setPrice(halfBarcode.getPrice() + thickness);
if (!halfBarcodeService.half(halfBarcode)){
throw new CoolException("鏇存柊鍗婃墭淇℃伅澶辫触");
}
@@ -58,17 +65,23 @@
throw new CoolException("璇ョ墿鏂欏凡鎶ュ簾锛岃鍕跨粦瀹�");
}
HalfBarcode halfBarcode = halfBarcodeService.selectByZpallet(waitPakin.getBarcode());
+ //瀵规ā鍏风殑瑙勬牸鍋氬鐞嗗緱鍒板帤搴�
+ Integer thickness = 0;
+ if (!Cools.isEmpty(mat.getSpecs())){
+ String[] split = mat.getSpecs().split("\\*");
+ thickness = Integer.parseInt(split[1]);
+ }
if (halfBarcode == null){
HalfBarcode hb = new HalfBarcode();
hb.setZpallet(waitPakin.getBarcode());
hb.setSpecs(waitPakin.getBarcode().substring(0,1));
hb.setAnfme(1);
if (Integer.parseInt(waitPakin.getBarcode().substring(0,1))==6){
- hb.setPrice(24-1);
+ hb.setPrice(2650 - thickness);
}else if(Integer.parseInt(waitPakin.getBarcode().substring(0,1))==7){
- hb.setPrice(24-1);
+ hb.setPrice(1750 - thickness);
}else if(Integer.parseInt(waitPakin.getBarcode().substring(0,1))==8){
- hb.setPrice(24-1);
+ hb.setPrice(800 - thickness);
}
if (!halfBarcodeService.insert(hb)){
throw new CoolException("鏇存柊鍗婃墭淇℃伅澶辫触");
@@ -76,13 +89,13 @@
}else {
if (Integer.parseInt(waitPakin.getBarcode().substring(0,1))==6){
halfBarcode.setAnfme(halfBarcode.getAnfme() + 1);
- halfBarcode.setPrice(halfBarcode.getPrice()-1);
+ halfBarcode.setPrice(2650 - thickness);
}else if(Integer.parseInt(waitPakin.getBarcode().substring(0,1))==7){
halfBarcode.setAnfme(halfBarcode.getAnfme() + 1);
- halfBarcode.setPrice(halfBarcode.getPrice()-1);
+ halfBarcode.setPrice(1750 - thickness);
}else if(Integer.parseInt(waitPakin.getBarcode().substring(0,1))==8){
halfBarcode.setAnfme(halfBarcode.getAnfme() + 1);
- halfBarcode.setPrice(halfBarcode.getPrice()-1);
+ halfBarcode.setPrice(800 - thickness);
}
if (!halfBarcodeService.half(halfBarcode)){
throw new CoolException("鏇存柊鍗婃墭淇℃伅澶辫触");
@@ -113,17 +126,23 @@
throw new CoolException("璇ョ墿鏂欏凡鎶ュ簾锛岃鍕跨粦瀹�");
}
HalfBarcode halfBarcode = halfBarcodeService.selectByZpallet(mat.getUnit());
+ //瀵规ā鍏风殑瑙勬牸鍋氬鐞嗗緱鍒板帤搴�
+ Integer thickness = 0;
+ if (!Cools.isEmpty(mat.getSpecs())){
+ String[] split = mat.getSpecs().split("\\*");
+ thickness = Integer.parseInt(split[1]);
+ }
if (halfBarcode == null){
HalfBarcode hb = new HalfBarcode();
hb.setZpallet(mat.getUnit());
hb.setSpecs(mat.getUnit().substring(0,1));
hb.setAnfme(1);
if (Integer.parseInt(mat.getUnit().substring(0,1))==6){
- hb.setPrice(24-1);
+ hb.setPrice(2650 - thickness);
}else if(Integer.parseInt(mat.getUnit().substring(0,1))==7){
- hb.setPrice(24-1);
+ hb.setPrice(1750 - thickness);
}else if(Integer.parseInt(mat.getUnit().substring(0,1))==8){
- hb.setPrice(24-1);
+ hb.setPrice(800 - thickness);
}
if (!halfBarcodeService.insert(hb)){
throw new CoolException("鏇存柊鍗婃墭淇℃伅澶辫触");
@@ -131,13 +150,13 @@
}else {
if (Integer.parseInt(mat.getUnit().substring(0,1))==6){
halfBarcode.setAnfme(halfBarcode.getAnfme() + 1);
- halfBarcode.setPrice(halfBarcode.getPrice()-1);
+ halfBarcode.setPrice(halfBarcode.getPrice()- thickness);
}else if(Integer.parseInt(mat.getUnit().substring(0,1))==7){
halfBarcode.setAnfme(halfBarcode.getAnfme() + 1);
- halfBarcode.setPrice(halfBarcode.getPrice()-1);
+ halfBarcode.setPrice(halfBarcode.getPrice()- thickness);
}else if(Integer.parseInt(mat.getUnit().substring(0,1))==8){
halfBarcode.setAnfme(halfBarcode.getAnfme() + 1);
- halfBarcode.setPrice(halfBarcode.getPrice()-1);
+ halfBarcode.setPrice(halfBarcode.getPrice()- thickness);
}
if (!halfBarcodeService.half(halfBarcode)){
throw new CoolException("鏇存柊鍗婃墭淇℃伅澶辫触");
@@ -148,7 +167,7 @@
mb.setMatnr(mat.getMatnr());
mb.setMaktx(mat.getMaktx());
mb.setSpecs(mat.getSpecs());
- mb.setModel(mat.getModel());
+ mb.setModel(mat.getName());
if (!matBarcodeService.insert(mb)){
throw new CoolException("鐗╂枡鎵樼洏缁戝畾澶辫触");
}
--
Gitblit v1.9.1