luobang 2 år sedan
förälder
incheckning
e9a8306944

+ 1 - 1
src/main/java/com/steerinfo/dil/feign/BmsTruckFeign.java

@@ -17,5 +17,5 @@ import java.util.Map;
 public interface BmsTruckFeign {
 
     @PostMapping("api/v1/bmstruck/bmstruckdetailsorder/addInwardDetailsOrder")
-    int addDetailsOrder(@RequestBody(required = false) Map<String,Object> map);
+    RESTfulResult addDetailsOrder(@RequestBody(required = false) Map<String,Object> map);
 }

+ 2 - 1
src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderSeparateServiceImpl.java

@@ -10,6 +10,7 @@ import com.steerinfo.dil.model.OmstruckOrder;
 import com.steerinfo.dil.model.OmstruckOrderMaterial;
 import com.steerinfo.dil.service.IOmstruckOrderSeparateService;
 import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -696,7 +697,7 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
             if(priceValueMap != null){
                 priceValueMap.put("netWeight", resultNetWeight);
                 priceValueMap.put("orderId",orderId);
-                i += bmsTruckFeign.addDetailsOrder(priceValueMap);
+                RESTfulResult resTfulResult =  bmsTruckFeign.addDetailsOrder(priceValueMap);
             }
         } catch (Exception e) {
             e.printStackTrace();

+ 2 - 2
src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.xml

@@ -538,8 +538,8 @@
             , OO.ORDER_LINE_SEQUENCE = #{sqe}
         </if>
         where
-        oo.order_status = 5
-        and oo.ORDER_ID = #{orderId}
+        OO.ORDER_STATUS = 5
+        AND oo.ORDER_ID = #{orderId}
     </update>
     <update id="updateSporadicStatus">
         update AMSTRUCK_SPORADIC_ORDER ASO