Merge branch 'test-temp-wj-250117-pack' into dev

dev-temp-nht-202502180000-customprint
王杰 4 months ago
commit 4c8f46dd44

@ -20,10 +20,7 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@ -175,9 +172,9 @@ public class MesProduceSnPrintController {
} }
} }
@PostMapping("/by-packageno-or-productsn/reprint-pack") @PostMapping("/by-packageno/reprint-pack")
@ApiOperation(value = "根据包装条码或者零件条码补打印包装条码") @ApiOperation(value = "根据包装条码或者零件条码补打印包装条码")
public ResultBean doRePrintPackByPackageNoOrProductSn(MesProduceSnPrintModel mesProduceSnPrintModel) { public ResultBean doRePrintPackByPackageNoOrProductSn(@RequestBody MesProduceSnPrintModel mesProduceSnPrintModel) {
try { try {
ValidatorBean.checkNotNull(mesProduceSnPrintModel.getPackageNo(), "包装条码不能为空"); ValidatorBean.checkNotNull(mesProduceSnPrintModel.getPackageNo(), "包装条码不能为空");
ValidatorBean.checkNotNull(mesProduceSnPrintModel.getOrganizeCode(), "工厂代码不能为空"); ValidatorBean.checkNotNull(mesProduceSnPrintModel.getOrganizeCode(), "工厂代码不能为空");

Loading…
Cancel
Save