rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: bug-776 所有的出库操作扫码后流程需要调整

This commit is contained in:
曹鹏飞 2025-10-09 11:57:55 +08:00
parent 19674ba135
commit 119e867890
6 changed files with 7 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java
View File

@ -171,6 +171,7 @@ public class OutAssistanceController extends BaseController {
.setItems(datas.stream()
.filter(item -> item.getLeft().compareTo(BigDecimal.ZERO) > 0)
.map(item -> new OutProduceItemVO()
.setId(item.getId())
.setLgort2(order.getLgort1())
.setLgpbe(item.getLgpbe())
.setMaktx2(item.getMaktx1())

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java
View File

@ -166,6 +166,7 @@ public class OutCostCenterController extends BaseController {
.setItems(datas.stream()
.filter(item -> item.getLeft().compareTo(BigDecimal.ZERO) > 0)
.map(item -> new OutProduceItemVO()
.setId(item.getId())
.setLgort2(item.getLgort())
.setLgpbe(item.getLgpbe())
.setMaktx2(item.getMaktx())

79
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java
View File

@ -91,45 +91,6 @@ public class OutProduceController extends BaseController {
List<Zwm3a07VO> vos = sapService.zwm3a07(request);
handleVos(vos);
return ApiResult.success(vos);
// List<WmsInventory> inventories = inventoryService.list();
// List<Zwm3a07VO> vos = new ArrayList<>();
// for (int i = 0, count = inventories.size(); i < count; i++) {
// WmsInventory inventory = inventories.get(i);
// vos.add(new Zwm3a07VO()
// .setInsme(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100")))
// .setDwerk(inventory.getFactoryNo())
// .setMatnr(inventory.getMaterialNo())
// .setAufnr(RandomUtil.randomNumbers(10))
// .setMaktx(RandomUtil.randomString(20))
// .setLgort2(inventory.getWarehouseNo())
// .setLgpbe(RandomUtil.randomString(10))
// .setMeins(RandomUtil.randomString(2))
// .setName(RandomUtil.randomString(10))
// .setQlsl(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100")))
// .setSqsl(RandomUtil.randomBigDecimal(BigDecimal.ZERO, inventory.getNum().divide(new BigDecimal("5"), RoundingMode.HALF_UP)))
// .setSqsl2(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100")))
// .setSqsl3(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100")))
// .setBdmng(RandomUtil.randomBigDecimal(new BigDecimal("50"), new BigDecimal("100")))
// .setLabst(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100")))
// .setKcqls(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100")))
// .setKtext(RandomUtil.randomString(20))
// .setRsnum(RandomUtil.randomNumbers(10))
// .setRsnum2(RandomUtil.randomNumbers(10))
// .setPlnbez(RandomUtil.randomString(20))
// .setEkgrp(RandomUtil.randomString(10))
// .setDispo(RandomUtil.randomString(10))
// .setCusn(RandomUtil.randomNumbers(10))
// .setBdter(DateUtil.format(DateUtil.date(), "yyyy-MM-dd"))
// .setVornr(RandomUtil.randomNumbers(10))
// .setSernr(RandomUtil.randomNumbers(10))
// .setJtsn(RandomUtil.randomNumbers(10))
// .setRspos(RandomUtil.randomNumbers(10))
// .setEnmng(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("50")))
// .setMaktx2(RandomUtil.randomString(20))
// .setLeftNum(inventory.getNum())
// );
// }
// return ApiResult.success(vos);
}
private void handleVos(List<Zwm3a07VO> vos) {
@ -152,45 +113,6 @@ public class OutProduceController extends BaseController {
List<Zwm3a07VO> vos = sapService.zwm3a08(request);
handleVos(vos);
return ApiResult.success(vos);
// List<WmsInventory> inventories = inventoryService.list();
// List<Zwm3a07VO> vos = new ArrayList<>();
// for (int i = 0, count = inventories.size(); i < count; i++) {
// WmsInventory inventory = inventories.get(i);
// vos.add(new Zwm3a07VO()
// .setInsme(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100")))
// .setMatnr(inventory.getMaterialNo())
// .setAufnr(RandomUtil.randomNumbers(10))
// .setMaktx(RandomUtil.randomString(20))
// .setLgort2(inventory.getWarehouseNo())
// .setLgpbe(RandomUtil.randomString(6))
// .setMeins(RandomUtil.randomString(2))
// .setName(RandomUtil.randomString(10))
// .setQlsl(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100")))
// .setSqsl(RandomUtil.randomBigDecimal(BigDecimal.ZERO, inventory.getNum().divide(new BigDecimal("5"), RoundingMode.HALF_UP)))
// .setSqsl2(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100")))
// .setSqsl3(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100")))
// .setBdmng(RandomUtil.randomBigDecimal(new BigDecimal("50"), new BigDecimal("100")))
// .setLabst(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100")))
// .setKcqls(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100")))
// .setKtext(RandomUtil.randomString(20))
// .setDwerk(inventory.getFactoryNo())
// .setRsnum(RandomUtil.randomNumbers(10))
// .setRsnum2(RandomUtil.randomNumbers(10))
// .setPlnbez(RandomUtil.randomString(20))
// .setEkgrp(RandomUtil.randomString(10))
// .setDispo(RandomUtil.randomString(10))
// .setCusn(RandomUtil.randomNumbers(10))
// .setBdter(DateUtil.format(DateUtil.date(), "yyyy-MM-dd"))
// .setVornr(RandomUtil.randomNumbers(10))
// .setSernr(RandomUtil.randomNumbers(10))
// .setJtsn(RandomUtil.randomNumbers(10))
// .setRspos(RandomUtil.randomNumbers(10))
// .setEnmng(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("50")))
// .setMaktx2(RandomUtil.randomString(20))
// .setLeftNum(inventory.getNum())
// );
// }
// return ApiResult.success(vos);
}
/**
@ -353,6 +275,7 @@ public class OutProduceController extends BaseController {
.setItems(datas.stream()
.filter(item -> item.getSqsl().subtract(item.getNum()).compareTo(BigDecimal.ZERO) > 0)
.map(item -> new OutProduceItemVO()
.setId(item.getId())
.setLgort2(order.getLgort2())
.setLgpbe(item.getLgpbe())
.setMaktx2(item.getMaktx2())

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java
View File

@ -187,6 +187,7 @@ public class TransferCompanyController extends BaseController {
.setLgort1(order.getLgort())
.setItems(datas.stream()
.map(item -> new TransferCompanyPdaItemVO()
.setId(item.getId())
.setEbelp(item.getEbelp())
.setEbeln(order.getEbeln())
.setMatnr(item.getMatnr())

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java
View File

@ -194,6 +194,7 @@ public class TransferFactoryController extends BaseController {
.setLgort(order.getLgort())
.setItems(datas.stream()
.map(item -> new TransferFactoryPdaItemVO()
.setId(item.getId())
.setMatnr(item.getMatnr())
.setMaktx(item.getMaktx())
.setLgort1(order.getUmlgo())

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutProduceSubmitQO.java
View File

@ -1,5 +1,6 @@
package com.nflg.wms.common.pojo.qo;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import lombok.Data;
@ -21,6 +22,7 @@ public class OutProduceSubmitQO {
/**
* 二维码列表
*/
@Valid
@NotEmpty
private List<QRCodeQO> qrCodes;
}