添加功能
This commit is contained in:
曹鹏飞
parent
c9ed597c86
commit
2e0df1c816
|
|
@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil;
|
|||
import cn.hutool.core.convert.Convert;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import cn.hutool.core.util.RandomUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.nflg.wms.admin.pojo.document.InMaterialScanRecord;
|
||||
import com.nflg.wms.admin.pojo.dto.PdfPageDTO;
|
||||
|
|
@ -19,10 +18,8 @@ import com.nflg.wms.common.pojo.PageData;
|
|||
import com.nflg.wms.common.pojo.dto.InventoryDTO;
|
||||
import com.nflg.wms.common.pojo.dto.MaterialQRCodeContentDTO;
|
||||
import com.nflg.wms.common.pojo.dto.TransferOrderDTO;
|
||||
import com.nflg.wms.common.pojo.qo.OutProduceSubmitQO;
|
||||
import com.nflg.wms.common.pojo.qo.OutProduceUpdateQO;
|
||||
import com.nflg.wms.common.pojo.qo.TransferFactorySearchQO;
|
||||
import com.nflg.wms.common.pojo.qo.TransferOrderQO;
|
||||
import com.nflg.wms.common.pojo.dto.ZWM00MB113DTO;
|
||||
import com.nflg.wms.common.pojo.qo.*;
|
||||
import com.nflg.wms.common.pojo.vo.*;
|
||||
import com.nflg.wms.common.util.UserUtil;
|
||||
import com.nflg.wms.common.util.VUtil;
|
||||
|
|
@ -268,29 +265,31 @@ public class TransferFactoryController extends BaseController {
|
|||
).toList()
|
||||
);
|
||||
Map<String, List<MaterialQRCodeContentDTO>> dmaps = dtos.stream().collect(Collectors.groupingBy(MaterialQRCodeContentDTO::getKey));
|
||||
// C_MaterialOutboundDTO vo = sapService.ZWM00_MB113(new C_MaterialOutboundQO()
|
||||
// .setResbRsNum(order.getRsnum())
|
||||
// .setItems(dmaps.values().stream().map(its -> {
|
||||
// WmsOutCostcenterItem item = datas.stream().filter(d -> StrUtil.equals(d.getMatnr(), its.get(0).getMaterialNo())).findFirst().get();
|
||||
// return new C_MaterialOutboundItemQO()
|
||||
// .setResbRspos(order.getRsnum())
|
||||
// .setResbMatnr(item.getMatnr())
|
||||
// .setMaktx(item.getMaktx())
|
||||
// .setResbLgort(order.getWerks())
|
||||
// .setResbMeins(item.getMeins())
|
||||
// .setQty(its.stream().map(MaterialQRCodeContentDTO::getNum).reduce(BigDecimal.ZERO, BigDecimal::add))
|
||||
// .setResbErfmg(item.getBdmng())
|
||||
// .setScanCodes(its.stream().map(qrCode -> new ScanCodeQO()
|
||||
// .setCodeId(qrCode.getUniqNo())
|
||||
// .setCodeNum(qrCode.getNum())
|
||||
// .setSerialNumber(qrCode.getSerialNo())
|
||||
// .setBatchNumber(qrCode.getBatchNo())
|
||||
// ).toList());
|
||||
// }).toList()
|
||||
// )
|
||||
// );
|
||||
// ticket.setMatDoc(vo.getEMblnr());
|
||||
// ticket.setDocYear(vo.getEMJahr());
|
||||
ZWM00MB113DTO vo = sapService.zwm00_mb113(new ZWM00MB113QO()
|
||||
.setIRsnum(order.getRsnum())
|
||||
.setIUmlgo(order.getUmlgo())
|
||||
.setT_list1(dmaps.values().stream().map(its -> {
|
||||
WmsTransferFactoryItem item = datas.stream().filter(d -> StrUtil.equals(d.getMatnr(), its.get(0).getMaterialNo())).findFirst().get();
|
||||
return new ZWM00MB113LIST1QO()
|
||||
.setRspos(order.getRsnum())
|
||||
.setMatnr(item.getMatnr())
|
||||
.setErfmg(its.stream().map(MaterialQRCodeContentDTO::getNum).reduce(BigDecimal.ZERO, BigDecimal::add))
|
||||
.setMeins(item.getMeins())
|
||||
.setWerks(order.getWerks())
|
||||
.setLgort(order.getLgort());
|
||||
}).toList()
|
||||
)
|
||||
.setT_list2(records.stream()
|
||||
.filter(record -> StrUtil.isNotBlank(record.getSerialNo()))
|
||||
.map(record -> new ZWM00MB113LIST2QO()
|
||||
.setRspos(order.getRsnum())
|
||||
.setSernr(record.getSerialNo())
|
||||
.setFlag("X")
|
||||
)
|
||||
.toList())
|
||||
);
|
||||
ticket.setMatDoc(vo.getEMblnr());
|
||||
ticket.setDocYear(vo.getEMjahr());
|
||||
transferFactoryTicketService.save(ticket);
|
||||
transferFactoryService.lambdaUpdate()
|
||||
.set(WmsTransferFactory::getSapStatus, true)
|
||||
|
|
@ -349,15 +348,15 @@ public class TransferFactoryController extends BaseController {
|
|||
*/
|
||||
@GetMapping("exportTicket")
|
||||
public void exportTicket(HttpServletResponse response, @Valid @RequestParam @NotNull Long id) throws Exception {
|
||||
// TransferFactoryTicketInfoVO order = transferFactoryTicketService.getInfo(id);
|
||||
// VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("调拨单不存在");
|
||||
// List<TransferFactoryItemVO> list = transferFactoryTicketItemService.getList(id);
|
||||
TransferFactoryTicketInfoVO order = new TransferFactoryTicketInfoVO();
|
||||
order.setNo(NoUtil.getTransferFactoryNo());
|
||||
List<TransferFactoryItemVO> list = new ArrayList<>();
|
||||
for (int i = 0, count = RandomUtil.randomInt(1, 100); i < count; i++) {
|
||||
list.add(new TransferFactoryItemVO().setMatnr(RandomUtil.randomNumbers(11)).setMaktx("非金属联件和紧固件等 M6 DIN 982 不锈钢304"));
|
||||
}
|
||||
TransferFactoryTicketInfoVO order = transferFactoryTicketService.getInfo(id);
|
||||
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("调拨单不存在");
|
||||
List<TransferFactoryItemVO> list = transferFactoryTicketItemService.getList(id);
|
||||
// TransferFactoryTicketInfoVO order = new TransferFactoryTicketInfoVO();
|
||||
// order.setNo(NoUtil.getTransferFactoryNo());
|
||||
// List<TransferFactoryItemVO> list = new ArrayList<>();
|
||||
// for (int i = 0, count = RandomUtil.randomInt(1, 100); i < count; i++) {
|
||||
// list.add(new TransferFactoryItemVO().setMatnr(RandomUtil.randomNumbers(11)).setMaktx("非金属联件和紧固件等 M6 DIN 982 不锈钢304"));
|
||||
// }
|
||||
Map<String, String> base = new HashMap<>();
|
||||
base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd"));
|
||||
base.put("qrcode", "data:image/png;base64," + Base64.getEncoder().encodeToString(QRCodeUtil.generateQRCode(order.getNo(), 100, 100)));
|
||||
|
|
|
|||
|
|
@ -1,15 +1,19 @@
|
|||
package com.nflg.wms.common.pojo.qo;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
public class ZWM00MB113LIST1QO {
|
||||
//工厂
|
||||
private String werks;
|
||||
//库存地点
|
||||
private String lgort;
|
||||
//以输入单位计的数量
|
||||
private String erfmg;
|
||||
private BigDecimal erfmg;
|
||||
//物料号
|
||||
private String matnr;
|
||||
//基本计量单位
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
package com.nflg.wms.common.pojo.qo;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
public class ZWM00MB113LIST2QO {
|
||||
//序列号
|
||||
private String sernr;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
package com.nflg.wms.common.pojo.qo;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
public class ZWM00MB113QO {
|
||||
//预留/相关需求的编号
|
||||
private String iRsnum;
|
||||
|
|
|
|||
Loading…
Reference in New Issue