Compare commits
No commits in common. "85f1f1740203886c2749b5c93607993da1a20fd0" and "0233a1f38791e6cc8ab0fc86b469fbebe8cb2f55" have entirely different histories.
85f1f17402
...
0233a1f387
|
|
@ -206,7 +206,6 @@ public class OutAssistanceController extends BaseController {
|
||||||
request.getQrCodes().forEach(qrCode -> {
|
request.getQrCodes().forEach(qrCode -> {
|
||||||
MaterialQRCodeContentDTO qrCodeContent = NoUtil.getMaterialQRCodeContent(qrCode.getContent());
|
MaterialQRCodeContentDTO qrCodeContent = NoUtil.getMaterialQRCodeContent(qrCode.getContent());
|
||||||
BigDecimal qrNum = qrCode.getNum();
|
BigDecimal qrNum = qrCode.getNum();
|
||||||
qrCodeContent.setNum(qrNum);
|
|
||||||
String materialNo = qrCodeContent.getMaterialNo();
|
String materialNo = qrCodeContent.getMaterialNo();
|
||||||
dtos.add(qrCodeContent);
|
dtos.add(qrCodeContent);
|
||||||
WmsOutAssistanceItem item = datas.stream().filter(d -> Objects.equals(d.getId(), qrCode.getItemId())).findFirst().orElse(null);
|
WmsOutAssistanceItem item = datas.stream().filter(d -> Objects.equals(d.getId(), qrCode.getItemId())).findFirst().orElse(null);
|
||||||
|
|
|
||||||
|
|
@ -201,7 +201,6 @@ public class OutCostCenterController extends BaseController {
|
||||||
request.getQrCodes().forEach(qrCode -> {
|
request.getQrCodes().forEach(qrCode -> {
|
||||||
MaterialQRCodeContentDTO qrCodeContent = NoUtil.getMaterialQRCodeContent(qrCode.getContent());
|
MaterialQRCodeContentDTO qrCodeContent = NoUtil.getMaterialQRCodeContent(qrCode.getContent());
|
||||||
BigDecimal qrNum = qrCode.getNum();
|
BigDecimal qrNum = qrCode.getNum();
|
||||||
qrCodeContent.setNum(qrNum);
|
|
||||||
String materialNo = qrCodeContent.getMaterialNo();
|
String materialNo = qrCodeContent.getMaterialNo();
|
||||||
dtos.add(qrCodeContent);
|
dtos.add(qrCodeContent);
|
||||||
WmsOutCostcenterItem item = datas.stream().filter(d -> Objects.equals(d.getId(), qrCode.getItemId())).findFirst().orElse(null);
|
WmsOutCostcenterItem item = datas.stream().filter(d -> Objects.equals(d.getId(), qrCode.getItemId())).findFirst().orElse(null);
|
||||||
|
|
|
||||||
|
|
@ -311,7 +311,6 @@ public class OutProduceController extends BaseController {
|
||||||
MaterialQRCodeContentDTO qrCodeContent = NoUtil.getMaterialQRCodeContent(qrCode.getContent());
|
MaterialQRCodeContentDTO qrCodeContent = NoUtil.getMaterialQRCodeContent(qrCode.getContent());
|
||||||
String materialNo = qrCodeContent.getMaterialNo();
|
String materialNo = qrCodeContent.getMaterialNo();
|
||||||
BigDecimal qrNum = qrCode.getNum();
|
BigDecimal qrNum = qrCode.getNum();
|
||||||
qrCodeContent.setNum(qrNum);
|
|
||||||
dtos.add(qrCodeContent);
|
dtos.add(qrCodeContent);
|
||||||
WmsOutProduceItem item = datas.stream().filter(d -> Objects.equals(d.getId(), qrCode.getItemId())).findFirst().orElse(null);
|
WmsOutProduceItem item = datas.stream().filter(d -> Objects.equals(d.getId(), qrCode.getItemId())).findFirst().orElse(null);
|
||||||
VUtil.trueThrowBusinessError(Objects.isNull(item)).throwMessage("物料" + materialNo + "不需要领料");
|
VUtil.trueThrowBusinessError(Objects.isNull(item)).throwMessage("物料" + materialNo + "不需要领料");
|
||||||
|
|
|
||||||
|
|
@ -129,7 +129,7 @@ public class OutPurchaseController extends BaseController {
|
||||||
.setUniqNo(dto.getUniqNo())
|
.setUniqNo(dto.getUniqNo())
|
||||||
.setFactoryNo(item.getWerks())
|
.setFactoryNo(item.getWerks())
|
||||||
.setWarehouseNo(item.getLgort())
|
.setWarehouseNo(item.getLgort())
|
||||||
.setNum(qrCode.getNum())
|
.setNum(dto.getNum())
|
||||||
.setUnit(it.getMeins())
|
.setUnit(it.getMeins())
|
||||||
.setEbeln(order.getEbeln())
|
.setEbeln(order.getEbeln())
|
||||||
.setEbeln(it.getEbelp())
|
.setEbeln(it.getEbelp())
|
||||||
|
|
|
||||||
|
|
@ -233,7 +233,6 @@ public class TransferCompanyController extends BaseController {
|
||||||
request.getQrCodes().forEach(qrCode -> {
|
request.getQrCodes().forEach(qrCode -> {
|
||||||
MaterialQRCodeContentDTO qrCodeContent = NoUtil.getMaterialQRCodeContent(qrCode.getContent());
|
MaterialQRCodeContentDTO qrCodeContent = NoUtil.getMaterialQRCodeContent(qrCode.getContent());
|
||||||
BigDecimal qrNum = qrCode.getNum();
|
BigDecimal qrNum = qrCode.getNum();
|
||||||
qrCodeContent.setNum(qrNum);
|
|
||||||
String materialNo = qrCodeContent.getMaterialNo();
|
String materialNo = qrCodeContent.getMaterialNo();
|
||||||
WmsTransferCompanyItem item = datas.stream().filter(d -> Objects.equals(d.getId(), qrCode.getItemId())).findFirst().orElse(null);
|
WmsTransferCompanyItem item = datas.stream().filter(d -> Objects.equals(d.getId(), qrCode.getItemId())).findFirst().orElse(null);
|
||||||
VUtil.trueThrowBusinessError(Objects.isNull(item)).throwMessage("物料" + materialNo + "不需要出库");
|
VUtil.trueThrowBusinessError(Objects.isNull(item)).throwMessage("物料" + materialNo + "不需要出库");
|
||||||
|
|
|
||||||
|
|
@ -232,7 +232,6 @@ public class TransferFactoryController extends BaseController {
|
||||||
request.getQrCodes().forEach(qrCode -> {
|
request.getQrCodes().forEach(qrCode -> {
|
||||||
MaterialQRCodeContentDTO qrCodeContent = NoUtil.getMaterialQRCodeContent(qrCode.getContent());
|
MaterialQRCodeContentDTO qrCodeContent = NoUtil.getMaterialQRCodeContent(qrCode.getContent());
|
||||||
BigDecimal qrNum = qrCode.getNum();
|
BigDecimal qrNum = qrCode.getNum();
|
||||||
qrCodeContent.setNum(qrNum);
|
|
||||||
String materialNo = qrCodeContent.getMaterialNo();
|
String materialNo = qrCodeContent.getMaterialNo();
|
||||||
WmsTransferFactoryItem item = datas.stream().filter(d -> Objects.equals(d.getId(), qrCode.getItemId())).findFirst().orElse(null);
|
WmsTransferFactoryItem item = datas.stream().filter(d -> Objects.equals(d.getId(), qrCode.getItemId())).findFirst().orElse(null);
|
||||||
VUtil.trueThrowBusinessError(Objects.isNull(item)).throwMessage("物料" + materialNo + "不需要出库");
|
VUtil.trueThrowBusinessError(Objects.isNull(item)).throwMessage("物料" + materialNo + "不需要出库");
|
||||||
|
|
|
||||||
|
|
@ -105,8 +105,6 @@ public class ComponentPackingControllerService {
|
||||||
wmsComponentPacking.setZjshz(request.getZjshz());
|
wmsComponentPacking.setZjshz(request.getZjshz());
|
||||||
wmsComponentPacking.setZchep(request.getZchep());
|
wmsComponentPacking.setZchep(request.getZchep());
|
||||||
wmsComponentPacking.setTelNumber(request.getTelNumber());
|
wmsComponentPacking.setTelNumber(request.getTelNumber());
|
||||||
wmsComponentPacking.setGStreen(request.getGstreen());
|
|
||||||
wmsComponentPacking.setGStrSuppl2(request.getGstrSuppl2());
|
|
||||||
//修改自己集合
|
//修改自己集合
|
||||||
List<WmsComponentPackingItem> wmsComponentPackingItems = wmsComponentPackingItemService
|
List<WmsComponentPackingItem> wmsComponentPackingItems = wmsComponentPackingItemService
|
||||||
.lambdaQuery()
|
.lambdaQuery()
|
||||||
|
|
|
||||||
|
|
@ -48,16 +48,6 @@ public class ComponentPackingEditInputQO {
|
||||||
*/
|
*/
|
||||||
private String telNumber;
|
private String telNumber;
|
||||||
|
|
||||||
/**
|
|
||||||
* 收货地址-T
|
|
||||||
*/
|
|
||||||
private String gstreen;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 收货人电话-
|
|
||||||
*/
|
|
||||||
private String gstrSuppl2;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 装箱单明细
|
* 装箱单明细
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue