出入库二维码和验证二维码修改

dao/src/main/resources/mapper/MajorProductionMapper.xml

@@ -75,7 +75,8 @@
         mp.if_save_file,
         mp.file_path,
         m.`name` AS majorName,
-        mp.checked_file_path
+        mp.checked_file_path,
+        mp.validate_code
         FROM
             major_production mp
                 LEFT JOIN major m ON m.id = mp.major_id

domain/src/main/java/com/dayou/entity/PersonalTarget.java

@@ -116,6 +116,11 @@ public class PersonalTarget extends BaseEntity {
      */
     private String validateCode;
 
+    /**
+     * 出入库二维码路经
+     */
+    private String qrCode;
+
     @TableField(exist = false)
     private String bailorA;
     @TableField(exist = false)

service/src/main/java/com/dayou/service/impl/BusinessProductionServiceImpl.java

@@ -145,8 +145,7 @@ public class BusinessProductionServiceImpl implements IBusinessProductionService
             String baseDir = dfsConfig.getPath()+dfsConfig.getCode();
             String dateIndexFileName = FileUploadUtils.createDateIndexFileName(reportNo + PNG);
             File absoluteFile = FileUploadUtils.getAbsoluteFile(baseDir, dateIndexFileName);
-            String flog = production.substring(0, 1);
-            QRCodeUtil.write(reportNo+flog,200,absoluteFile);
+            QRCodeUtil.write(reportNo,200,absoluteFile);
             return dfsConfig.getDomain() + dfsConfig.getCode() + dateIndexFileName;
         } catch (IOException e) {
             throw new RuntimeException(e);
@@ -204,30 +203,29 @@ public class BusinessProductionServiceImpl implements IBusinessProductionService
                 if (STATEMENT_IN.name().equals(code)){
                     production.setProduction(STATEMENT.name());
                     taskRecord.setTaskData(production);
-                    personalProductionService.repertoryIn(taskRecord);
+                    doWareHouseRet = personalProductionService.repertoryIn(taskRecord);
                 }else if (STATEMENT_OUT.name().equals(code)){
                     production.setProduction(STATEMENT.name());
                     taskRecord.setTaskData(production);
-                    personalProductionService.repertoryOut(taskRecord);
+                    doWareHouseRet = personalProductionService.repertoryOut(taskRecord);
                 }else if (REPORT_IN.name().equals(code)){
                     production.setProduction(REPORT.name());
                     taskRecord.setTaskData(production);
-                    personalProductionService.repertoryIn(taskRecord);
+                    doWareHouseRet = personalProductionService.repertoryIn(taskRecord);
                 }else if (REPORT_OUT.name().equals(code)){
                     production.setProduction(REPORT.name());
                     taskRecord.setTaskData(production);
-                    personalProductionService.repertoryOut(taskRecord);
+                    doWareHouseRet = personalProductionService.repertoryOut(taskRecord);
                 }else if (LETTER_IN.name().equals(code)){
                     production.setProduction(LETTER.name());
                     taskRecord.setTaskData(production);
-                    personalProductionService.repertoryIn(taskRecord);
+                    doWareHouseRet = personalProductionService.repertoryIn(taskRecord);
                 }else if (LETTER_OUT.name().equals(code)){
                     production.setProduction(LETTER.name());
                     taskRecord.setTaskData(production);
-                    personalProductionService.repertoryOut(taskRecord);
-                }else{
-                    break;
+                    doWareHouseRet = personalProductionService.repertoryOut(taskRecord);
                 }
+                break;
             case MAJOR_BUSINESS:
                 TaskRecordDTO<WareHouseDTO> taskRecordDTO = new TaskRecordDTO<>();
                 taskRecordDTO.setRecordId(recordId);

service/src/main/java/com/dayou/service/impl/MajorProductionServiceImpl.java

@@ -153,7 +153,7 @@ public class MajorProductionServiceImpl extends ServiceImpl<MajorProductionMappe
 
         }
 
-        //创建普通二维码
+        //创建出入库二维码
         taskData.setQrCode(businessProductionService.doCreateNormalCode(taskData.getProduction(),reportNo));
         taskData.setStandardAmount(productionFundService.calculateStandardAmount(taskData.getEvaluateAmount()));
         this.save(taskData);

service/src/main/java/com/dayou/service/impl/PersonalServiceImpl.java

@@ -135,6 +135,8 @@ public class PersonalServiceImpl extends ServiceImpl<PersonalMapper, Personal> i
         PersonalTarget pt = new PersonalTarget();
         pt.setPersonalId(personal.getId());
         pt.setLocation(personal.getLocation());
+        //生成出入库二维码
+        pt.setQrCode(businessProductionService.doCreateNormalCode(null,personal.getOrderId()));
         //生成验证二维码
         pt.setValidateCode(businessProductionService.doCreateValidateCode(PERSONAL_BUSINESS, personal.getId(), personal.getOrderId()));
         personalTargetService.save(pt);

sql/update_sql.sql

@@ -622,7 +622,13 @@ ALTER TABLE assets MODIFY COLUMN dispense_benefit bit(1) NULL COMMENT '是否分
 ALTER TABLE assets MODIFY COLUMN terminal_clientele_type varchar(32) NULL COMMENT '终端客户类型（企业，个人）';
 
 
+/**
+    日期：2024-08-07
+    修改人:吴长林
+    未更新到test-env
+ */
 
+ALTER TABLE `personal_target` ADD qr_code varchar(255) NULL COMMENT '出入库二维码';