diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/param/ConsCheckStockParam.java b/cash-common/cash-common-service/src/main/java/com/czg/product/param/ConsCheckStockParam.java index 754ea3b30..458d34c9e 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/param/ConsCheckStockParam.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/product/param/ConsCheckStockParam.java @@ -31,7 +31,6 @@ public class ConsCheckStockParam implements Serializable { */ @NotBlank(message = "耗材名称不能为空", groups = DefaultGroup.class) private String conName; - @NotBlank(message = "操作员不能为空", groups = DefaultGroup.class) private String operator; /** diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java index 346a3b521..32e1bea81 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java @@ -570,7 +570,7 @@ public interface PrinterImpl { String stockNumberCountStr = "数量" + record.getStockNumberCount(); String amountCountStr = "金额" + record.getAmountCount(); - String totalLine = key4("总计", consCountStr, stockNumberCountStr, amountCountStr, 6, 9, 7); + String totalLine = key4("总计", consCountStr, stockNumberCountStr, amountCountStr, 4, 9, 7); builder.append(getFormatLabel(totalLine, signLabelInfo.s)).append(signLabelInfo.br); builder.append(getDividingLine()).append(signLabelInfo.br); @@ -760,7 +760,7 @@ public interface PrinterImpl { builder.append(getFormatLabel("盘点单", signLabelInfo.center)).append(signLabelInfo.br).append(signLabelInfo.br); // 表头:耗材名称、单价、实际数、盈亏数(四列对齐,复用key4工具方法) - String header = key4("耗材名称", "单价", "实际数", "盈亏数", 12, 10, 8); + String header = key4("耗材名称", "单价", "实际数", "盈亏数", 10, 7, 7); builder.append(getFormatLabel(header, signLabelInfo.s)).append(signLabelInfo.br); // 遍历耗材明细,逐行打印 @@ -771,7 +771,7 @@ public interface PrinterImpl { String actualNumberStr = item.getActualNumber().toString(); String winLossNumberStr = item.getWinLossNumber().toString(); // 四列对齐打印 - String itemLine = key4(item.getConsName(), priceStr, actualNumberStr, winLossNumberStr, 12, 10, 8); + String itemLine = key4(item.getConsName(), priceStr, actualNumberStr, winLossNumberStr, 8, 10, 8); builder.append(getFormatLabel(itemLine, signLabelInfo.s)).append(signLabelInfo.br); } }