优化代码

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -1487,14 +1487,15 @@ public class SalesOrderServiceImpl implements SalesOrderService {
             }
         }else{
             // 正常库存出库（包含正常销售与售后）
-            SalesOrder so = salesOrderMapper.getSalesOrderById(salesOrder.getSalesId());SalesOrderItem salesOrderItem = new SalesOrderItem();
+            SalesOrder so = salesOrderMapper.getSalesOrderById(salesOrder.getSalesId());
+            SalesOrderItem salesOrderItem = new SalesOrderItem();
             salesOrderItem.setItemOrderId(so.getSalesId());
             List<SalesOrderItem> listOrderitem = salesOrderService.listSalesOrderItem(salesOrderItem);
             // 查询维修编号,并根据维修编号对应的处理结果判断是否从不良品中出库
             List<ComplaintDetectInfo> listDetect  = complaintDetectInfoMapper.listComplaintDetectBySalesId(so.getSalesOrderId());
             boolean isDefectiveProduct = false;
             if (listDetect != null && !listDetect.isEmpty()) {
-                int result = listDetect.get(0).getState();
+                int result = listDetect.get(0).getDetectState();
                 if (result == 32 || result == 36 || result == 37) {
                     // 凡是（付费维修-维修完成）、（免费维修-维修完成）、（机器无故障，原机退回）都走不良品
                     isDefectiveProduct = true;

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -799,6 +799,7 @@ public class AwaitSendController {
         try{
             flag = salesOrderService.updateDeliver(salesOrder);
         }catch (Exception e){
+            LOGGER.error("", e);
             rj.setResultMsg("出货失败，该物流单号（"+postNum+"）无法出库;</br>原因："+e.getMessage());
             return rj;
         }