'修改采购订单接口bug'

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

@@ -67,8 +67,6 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         BigDecimal batchId;
 //        if (amsPurchaseOrderMapper.getBatchId(map) == null) {
         DilBatch dilBatch = new DilBatch();
-        batchId = dilBatchMapper.selectBatchId();
-        dilBatch.setBatchId(batchId);
         dilBatch.setResultForeignShipName(resultForeignShipName);
         dilBatch.setMaterialId(materialId);
         dilBatch.setInsertTime(new Date());
@@ -110,7 +108,6 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         amsPurchaseOrder.setPurchaseOrderNo(purchaseOrderNo);
         amsPurchaseOrder.setPurchaseOrderBuyer(purchaseOrderBuyer);
         amsPurchaseOrder.setPuchaseOrderMaterialNumber(new BigDecimal(purchaseOrderMaterialNumber));
-        amsPurchaseOrder.setBatchId(batchId);
         amsPurchaseOrder.setSupplierUnitId(supplierId);
         amsPurchaseOrder.setReceiveUnitId(purchasingOrganizationId);
         amsPurchaseOrder.setPurchasingOrganizationId(purchasingOrganizationId);
@@ -129,6 +126,9 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         // 新增
         if (amsPurchaseOrders.size() == 0) {
             BigDecimal purchaseId = amsPurchaseOrderMapper.getPurchaseId();
+            batchId = dilBatchMapper.selectBatchId();
+            dilBatch.setBatchId(batchId);
+            amsPurchaseOrder.setBatchId(batchId);
             amsPurchaseOrder.setPurchaseOrderId(purchaseId);
             amsPurchaseOrder.setDeleted(new BigDecimal(0));
             dilBatchMapper.insertSelective(dilBatch);
@@ -136,6 +136,9 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         }
         if (amsPurchaseOrders.size() != 0 && dataStatus == 1) {
             AmsPurchaseOrder amsPurchaseOrder1 = amsPurchaseOrders.get(0);
+            batchId = dilBatchMapper.selectBatchId();
+            dilBatch.setBatchId(batchId);
+            amsPurchaseOrder.setBatchId(batchId);
             amsPurchaseOrder.setDeleted(deleted);
             amsPurchaseOrder.setPurchaseOrderId(amsPurchaseOrder1.getPurchaseOrderId());
             result = amsPurchaseOrderMapper.updateByPrimaryKeySelective(amsPurchaseOrder);

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

@@ -123,7 +123,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 amsSaleOrder.setReceiveId(receiveId);
                 amsSaleOrder.setShipperId(shipperId);
                 if (isSelfMention != null) {
-                    if (isSelfMention.equals("自提")) {
+                    if (isSelfMention.equals("CARRY")) {
                         amsSaleOrder.setSaleOrderIsselfMention("是");
                     } else {
                         amsSaleOrder.setSaleOrderIsselfMention("否");

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

@@ -35,7 +35,7 @@ public class TmsTruckQualityService implements ITmsTruckQualityResultService {
     @Autowired
     TmstruckWeightResultMapper tmstruckWeightResultMapper;
     //定时访问质检系统，获取质检实绩
-    @Scheduled(cron = "* 1 * * * ?")
+//    @Scheduled(cron = "* 1 * * * ?")
     @Override
     public int insertQualityResult() throws IOException, DocumentException {
         //先查出所有没有质检实绩的磅单号

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

@@ -255,19 +255,19 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         }
         //毛重
         if(map.get("resultCrossWeight") != null){
-            String resultCrossWeight = (String) map.get("resultCrossWeight");
+            String resultCrossWeight = String.valueOf(map.get("resultCrossWeight"));
             if(!"".equals(resultCrossWeight))
                 tmstruckWeightResult.setResultGrossWeight(DataChange.dataToBigDecimal(resultCrossWeight));
         }
         //皮重
         if(map.get("resultTareWeight") != null){
-            String resultTareWeight = (String) map.get("resultTareWeight");
+            String resultTareWeight = String.valueOf(map.get("resultTareWeight"));
             if(!"".equals(resultTareWeight))
             tmstruckWeightResult.setResultTareWeight(DataChange.dataToBigDecimal(resultTareWeight));
         }
         //净重
         if(map.get("resultNetWeight") != null){
-            String resultNetWeight = (String) map.get("resultNetWeight");
+            String resultNetWeight = String.valueOf(map.get("resultNetWeight"));
             if(!"".equals(resultNetWeight)){
                 tmstruckWeightResult.setResultNetWeight(DataChange.dataToBigDecimal(resultNetWeight));
             }

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

@@ -40,23 +40,20 @@ public class DataChange {
      * @param data
      * @return
      */
-    public static BigDecimal
-    dataToBigDecimal(Object data){
+    public static BigDecimal dataToBigDecimal(Object data){
         if (data != null){
-            if(data instanceof String){
-                String data1 = (String) data;
-                return new BigDecimal(data1);
-            }
-            if(data instanceof Integer){
-                Integer data2 = (Integer) data;
-                return new BigDecimal(data2);
-            }
-            if(data instanceof Double){
-                Double data3 = (Double) data;
-                return new BigDecimal(data3.toString());
-            }
             if(data instanceof BigDecimal){
                 return (BigDecimal) data;
+            }else{
+                String str = String.valueOf(data);
+                BigDecimal decimal = null;
+                try {
+                    decimal = new BigDecimal(str);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    return new BigDecimal(0);
+                }
+                return decimal;
             }
         }
         return new BigDecimal(0);

src/main/resources/application-prod.yml

@@ -6,3 +6,4 @@ spring:
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dal-dazhou-join-api
+

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

@@ -141,9 +141,9 @@
         select
                TRR.RESULT_ID
         from OMSTRUCK_ORDER OO
-        left join TMSTRUCK_TOTAL_RESULT TTR
+        join TMSTRUCK_TOTAL_RESULT TTR
             on TTR.ORDER_ID = OO.ORDER_ID
-        left join TMSTRUCK_RECEIPT_RESULT TRR
+        join TMSTRUCK_RECEIPT_RESULT TRR
             on TRR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         where OO.ORDER_NUMBER = #{orderNumber} and TRR.status = 1
     </select>