1463 WMS系统钢构包采购业务功能优化
This commit is contained in:
parent
ec3464950e
commit
d854ccd7d8
|
|
@ -625,14 +625,14 @@ public class StructuralPackageOrderController extends BaseController {
|
||||||
for (int i = 0, count = it.getShipmentNum().intValue(); i < count; i++) {
|
for (int i = 0, count = it.getShipmentNum().intValue(); i < count; i++) {
|
||||||
DeliverStructuralPackageOrderTrayItemVO vo = BeanUtil.copy(it, DeliverStructuralPackageOrderTrayItemVO.class);
|
DeliverStructuralPackageOrderTrayItemVO vo = BeanUtil.copy(it, DeliverStructuralPackageOrderTrayItemVO.class);
|
||||||
vo.setQrCodeId(code + "-" + (i + 1));
|
vo.setQrCodeId(code + "-" + (i + 1));
|
||||||
vo.setQrCode(vo.getQrCodeId() + "^" + it.getMaterialNo() + "_" + it.getTrayNo() + "_1");
|
vo.setQrCode(vo.getQrCodeId() + "^" + it.getMaterialNo() + "_1");
|
||||||
vo.setQrCodeImage(QRCodeUtil.generateQRCodeBase64(vo.getQrCode(), 200, 200));
|
vo.setQrCodeImage(QRCodeUtil.generateQRCodeBase64(vo.getQrCode(), 200, 200));
|
||||||
datas.add(vo);
|
datas.add(vo);
|
||||||
}
|
}
|
||||||
if (it.getShipmentNum().remainder(BigDecimal.ONE).compareTo(BigDecimal.ZERO) > 0) {
|
if (it.getShipmentNum().remainder(BigDecimal.ONE).compareTo(BigDecimal.ZERO) > 0) {
|
||||||
DeliverStructuralPackageOrderTrayItemVO vo = BeanUtil.copy(it, DeliverStructuralPackageOrderTrayItemVO.class);
|
DeliverStructuralPackageOrderTrayItemVO vo = BeanUtil.copy(it, DeliverStructuralPackageOrderTrayItemVO.class);
|
||||||
vo.setQrCodeId(code + "-" + (it.getShipmentNum().intValue() + 1));
|
vo.setQrCodeId(code + "-" + (it.getShipmentNum().intValue() + 1));
|
||||||
vo.setQrCode(vo.getQrCodeId() + "^" + it.getMaterialNo() + "_" + it.getTrayNo() + "_" + it.getShipmentNum().remainder(BigDecimal.ONE));
|
vo.setQrCode(vo.getQrCodeId() + "^" + it.getMaterialNo() + "_" + it.getShipmentNum().remainder(BigDecimal.ONE));
|
||||||
vo.setQrCodeImage(QRCodeUtil.generateQRCodeBase64(vo.getQrCode(), 200, 200));
|
vo.setQrCodeImage(QRCodeUtil.generateQRCodeBase64(vo.getQrCode(), 200, 200));
|
||||||
datas.add(vo);
|
datas.add(vo);
|
||||||
}
|
}
|
||||||
|
|
@ -673,14 +673,14 @@ public class StructuralPackageOrderController extends BaseController {
|
||||||
for (int i = 0, count = it.getShipmentNum().intValue(); i < count; i++) {
|
for (int i = 0, count = it.getShipmentNum().intValue(); i < count; i++) {
|
||||||
DeliverStructuralPackageOrderTrayItemVO vo = BeanUtil.copy(it, DeliverStructuralPackageOrderTrayItemVO.class);
|
DeliverStructuralPackageOrderTrayItemVO vo = BeanUtil.copy(it, DeliverStructuralPackageOrderTrayItemVO.class);
|
||||||
vo.setQrCodeId(it.getId() + "-" + (i + 1));
|
vo.setQrCodeId(it.getId() + "-" + (i + 1));
|
||||||
vo.setQrCode(it.getId() + "-" + (i + 1) + "^" + it.getMaterialNo() + "_" + it.getTrayNo() + "_1");
|
vo.setQrCode(it.getId() + "-" + (i + 1) + "^" + it.getMaterialNo() + "_1");
|
||||||
vo.setQrCodeImage(QRCodeUtil.generateQRCodeBase64(vo.getQrCode(), 200, 200));
|
vo.setQrCodeImage(QRCodeUtil.generateQRCodeBase64(vo.getQrCode(), 200, 200));
|
||||||
datas.add(vo);
|
datas.add(vo);
|
||||||
}
|
}
|
||||||
if (it.getShipmentNum().remainder(BigDecimal.ONE).compareTo(BigDecimal.ZERO) > 0) {
|
if (it.getShipmentNum().remainder(BigDecimal.ONE).compareTo(BigDecimal.ZERO) > 0) {
|
||||||
DeliverStructuralPackageOrderTrayItemVO vo = BeanUtil.copy(it, DeliverStructuralPackageOrderTrayItemVO.class);
|
DeliverStructuralPackageOrderTrayItemVO vo = BeanUtil.copy(it, DeliverStructuralPackageOrderTrayItemVO.class);
|
||||||
vo.setQrCodeId(it.getId() + "-" + (it.getShipmentNum().intValue() + 1));
|
vo.setQrCodeId(it.getId() + "-" + (it.getShipmentNum().intValue() + 1));
|
||||||
vo.setQrCode(it.getId() + "-" + (it.getShipmentNum().intValue() + 1) + "^" + it.getMaterialNo() + "_" + it.getTrayNo() + "_" + it.getShipmentNum().remainder(BigDecimal.ONE));
|
vo.setQrCode(it.getId() + "-" + (it.getShipmentNum().intValue() + 1) + "^" + it.getMaterialNo() + "_" + it.getShipmentNum().remainder(BigDecimal.ONE));
|
||||||
vo.setQrCodeImage(QRCodeUtil.generateQRCodeBase64(vo.getQrCode(), 200, 200));
|
vo.setQrCodeImage(QRCodeUtil.generateQRCodeBase64(vo.getQrCode(), 200, 200));
|
||||||
datas.add(vo);
|
datas.add(vo);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue