Merge branch 'sprint/S3' into release/S3

demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/production/ProductionCreateEAIService.java

@@ -66,13 +66,14 @@ public class ProductionCreateEAIService extends AbsEAIService {
         Integer batchNo = 1;
         for (ProductionDetailsEntity productionDetailsEntity : productionDetailsEntities) {
             int randomNumber = random.nextInt(3);
+            int nature = random.nextInt(2)+1;
             productionDetailsEntity.setFactoryNo(this.list.get(randomNumber).getFactoryNo());
             productionDetailsEntity.setFactoryName(this.list.get(randomNumber).getFactoryName());
             productionDetailsEntity.setProductionManagementPerson(this.list.get(randomNumber).getProductionManagementPerson());
             productionDetailsEntity.setProductionManagementDepartment("生管一部");
             productionDetailsEntity.setProduceBoss("23467345221");
             productionDetailsEntity.setProductionStatus(TabStatusEnums.PENDING.getValue().toString());
-            productionDetailsEntity.setNature(String.valueOf(randomNumber));
+            productionDetailsEntity.setNature(String.valueOf(nature));
             productionDetailsEntity.setBatchNo("MMDD-000"+batchNo);
             productionDetailsEntity.setUnit("pcs");
             batchNo = batchNo+1;

demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/receivables/ReceivablesInitialCreateEAIService.java

@@ -141,8 +141,8 @@ public class ReceivablesInitialCreateEAIService extends AbsEAIService {
             receivablesDetailEntity.setSalesOrder("SO-"+SnowflakeWorker.nextId());
             receivablesDetailEntity.setSalesOrderNumber("SON-000"+no);
             receivablesDetailEntity.setSalesmanAssistant("Sp0001");
-            receivablesDetailEntity.setSalesmanBoss("qcsupplier001");
-            receivablesDetailEntity.setSalesman("qcuser001");
+            receivablesDetailEntity.setSalesmanBoss("qcuser004");
+            receivablesDetailEntity.setSalesman("Sp0001");
             receivablesDetailEntity.setProduceBoss("Sp0002");
             receivablesDetailEntity.setEmail("ath_Sp0001@163.com");
             receivablesDetailEntity.setWorkNo("work-"+SnowflakeWorker.nextId());