打印全部内部码问题

src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java

@@ -80,7 +80,6 @@ public class BasicOrderPrintController {
     public BaseResponse inspectionStockOrderPDFFromTemplateFile(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest) {
 
 
-
         String name = getStatusName(filterOrderPrintRequest.getStatus());
         SysPdfTemplateRelevanceCodeEntity sysPdfTemplateRelevanceCodeEntity = systemPDFTemplateRelevanceCodeService.selectNameAndAction(name, filterOrderPrintRequest.getAction());
         if (sysPdfTemplateRelevanceCodeEntity != null) {
@@ -273,7 +272,10 @@ public class BasicOrderPrintController {
                 Map<String, Object> bizData = new HashMap<>();
                 bizData.put("index", i);
                 bizData.put("nameCode", obj.getNameCode() == null ? ' ' : obj.getNameCode());
-                bizData.put("udiCode", udiProductEntity.getUuid() == null ? ' ' : udiProductEntity.getUuid());
+                String udiCode = "#" + obj.getNameCode() + "#" + obj.getProduceDate() + "#" + obj.getExpireDate() +
+                        "#" + obj.getBatchNo() + "#" + obj.getSerialNo() + "#" + obj.getWarehouseCode() + "#" + obj.getDeptCode();
+                udiCode = udiCode.replaceAll("#null", "#");
+                bizData.put("udiCode", udiCode);
                 bizData.put("cpmctymc", udiProductEntity.getCpmctymc() == null ? ' ' : udiProductEntity.getCpmctymc());
                 bizData.put("ggxh", udiProductEntity.getGgxh() == null ? ' ' : udiProductEntity.getGgxh());
                 bizData.put("batchNo", obj.getBatchNo() == null ? ' ' : obj.getBatchNo());

src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java

@@ -10,11 +10,10 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BusinessType;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.entity.inv.InnerOrderEntity;
-import com.glxp.api.entity.inv.InvInnerOrderPrintEntity;
 import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity;
+import com.glxp.api.entity.inv.InvInnerOrderPrintEntity;
 import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
 import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
-import com.glxp.api.entity.system.SystemPDFModuleEntity;
 import com.glxp.api.entity.system.SystemPDFTemplateEntity;
 import com.glxp.api.req.inout.InspectionPDFTemplateRequest;
 import com.glxp.api.req.inv.*;
@@ -42,7 +41,10 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 public class InvInnerOrderPrintController {

src/main/java/com/glxp/api/req/auth/PCLoginRequest.java

@@ -13,7 +13,6 @@ public class PCLoginRequest {
     @NotEmpty(message = "密码不能为空")
     private String password;
 
-    @NotEmpty(message = "机器码不能为空")
     private String machineInfo;
 
 }