10.11提交

src/main/java/com/steerinfo/dil/feign/ColumnDataFeign.java

@@ -12,7 +12,7 @@ import java.util.Map;
  * @Date 2021/6/23 9:58
  * @Version 1.0
  */
-@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "192.168.1.241:8083")
+@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "192.168.0.106:8083")
 public interface ColumnDataFeign {
     @RequestMapping("getColumnData")
     List<Map<String,Object>> getColumnData(@RequestParam("apiId") Integer apiId);

src/main/java/com/steerinfo/dil/service/impl/BmstrainDetailsOrderServiceImpl.java

@@ -127,7 +127,7 @@ public class BmstrainDetailsOrderServiceImpl implements IBmstrainDetailsOrderSer
         BigDecimal detailsId = selectMaxId();
         bmstrainDetailsOrder.setDetailsId(detailsId);
         // 设置详单号
-        String detailsNo = noUtil.setResultNo("XD", detailsId);
+        String detailsNo = noUtil.setResultNo("HYXD", detailsId);
         bmstrainDetailsOrder.setDetailsNo(detailsNo);
         // 设置详单时间
         bmstrainDetailsOrder.setDetailsTime(new Date());

src/main/java/com/steerinfo/dil/service/impl/BmstrainStatementServiceImpl.java

@@ -76,7 +76,7 @@ public class BmstrainStatementServiceImpl implements IBmstrainStatementService {
             BigDecimal statementId = selectMaxId();
             bmstrainStatement.setStatementId(statementId);
             // 设置账单编号
-            String statementNo = noUtil.setResultNo("ZD", statementId);
+            String statementNo = noUtil.setResultNo("HYZD", statementId);
             bmstrainStatement.setStatementNo(statementNo);
             bmstrainStatement.setStatementShipperId(new BigDecimal(1));
             Double totalAmount = new Double(0);

src/main/java/com/steerinfo/dil/util/NoUtil.java

@@ -19,21 +19,31 @@ public class NoUtil {
         String resultNo = noStr +  now.getYear();
         Integer month = now.getMonthValue();
         String monthStr = month.toString();
+        Integer day = now.getDayOfMonth();
+        String dayStr = day.toString();
         if (monthStr.length() != 2) {
             resultNo = resultNo + "0" + now.getMonthValue();
         }
         else {
             resultNo = resultNo + now.getMonthValue();
         }
-        resultNo = resultNo + now.getDayOfMonth();
+        if (dayStr.length() != 2) {
+            resultNo = resultNo + "0" + now.getDayOfMonth();
+        }
+        else {
+            resultNo = resultNo + now.getDayOfMonth();
+        }
         switch ((resultId.toString()).length()) {
             case 1:
-                resultNo = resultNo + "000" + resultId;
+                resultNo = resultNo + "0000" + resultId;
                 break;
             case 2:
-                resultNo = resultNo + "00" + resultId;
+                resultNo = resultNo + "000" + resultId;
                 break;
             case 3:
+                resultNo = resultNo + "00" + resultId;
+                break;
+            case 4:
                 resultNo = resultNo + "0" + resultId;
                 break;
             default:resultNo = resultNo + resultId;

src/main/resources/application-dev.yml

@@ -5,5 +5,5 @@ spring:
     username: DIL0901
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: [name]
+    name: dil-bmstrain-api-dev
 

src/main/resources/application-prod.yml

@@ -5,4 +5,4 @@ spring:
     username: DIL0901
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: [name]
+    name: dil-bmstrain-api-dev

src/main/resources/com/steerinfo/dil/mapper/BmstrainDetailsOrderMapper.xml

@@ -727,6 +727,7 @@
         ON db.BATCH_ID = apo.PURCHASE_ORDER_ID
         LEFT JOIN RMS_MATERIAL rm
         ON rm.MATERIAL_ID = db.MATERIAL_ID
+        WHERE tlr.DELETED = 0
         )
         <where>
             <if test="purchaseOrderNo!= null">